Mercurial > hg > anonet-resdb
changeset 588:f822bc52987c draft
Merge remote branch 'srn/master'
| author | sevil <sevil@sevilnatas.ano> |
|---|---|
| date | Mon, 08 Aug 2011 15:12:41 +0000 |
| parents | 8b805f369af2 (current diff) 618448765814 (diff) |
| children | 41907b4e5e69 |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/a2/owner Mon Aug 08 15:12:41 2011 +0000 @@ -0,0 +1,1 @@ +A2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/42/43/cidr Mon Aug 08 15:12:41 2011 +0000 @@ -0,0 +1,1 @@ +1.66.67.0/24
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/42/43/owner Mon Aug 08 15:12:41 2011 +0000 @@ -0,0 +1,1 @@ +A2
--- a/doc/www.anonet2.org/public_pod/darknet_comparison.pod Wed Aug 03 16:37:18 2011 +0000 +++ b/doc/www.anonet2.org/public_pod/darknet_comparison.pod Mon Aug 08 15:12:41 2011 +0000 @@ -39,9 +39,9 @@ Z<><tr>Z<><th>Actual Government betrays Claimed PurposeZ<></th>Z<><td>yesZ<></td>Z<><td>noZ<></td>Z<><td>noZ<></td>Z<><td>noZ<></td>Z<></tr> Z<><tr>Z<><th>Centralized Critical InfrastructureZ<></th>Z<><td>wiki (includes resource database), client port, IRCZ<></td>Z<><td>noneZ<></td>Z<><td>wiki, IRCZ<></td>Z<><td>allZ<></td>Z<></tr> Z<><tr>Z<><th>Decentralized Critical InfrastructureZ<></th>Z<><td>routingZ<></td>Z<><td>allZ<></td>Z<><td>routing, resource databaseZ<></td>Z<><td>noneZ<></td>Z<></tr> - Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>10-15Z<></td>Z<><td>35-45Z<></td>Z<><td>60-75Z<></td>Z<><td><5Z<></td>Z<></tr> - Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~10%Z<></td>Z<><td>~0%Z<></td>Z<><td>~0%Z<></td>Z<></tr> - Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>lowZ<></td>Z<><td>mediumZ<></td>Z<><td>mediumZ<></td>Z<><td>noneZ<></td>Z<></tr> + Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>10-15Z<></td>Z<><td>40-60Z<></td>Z<><td>60-80Z<></td>Z<><td><5Z<></td>Z<></tr> + Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~10%Z<></td>Z<><td><5%%Z<></td>Z<><td>~0%Z<></td>Z<></tr> + Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>lowZ<></td>Z<><td>medium-highZ<></td>Z<><td>low-mediumZ<></td>Z<><td>noneZ<></td>Z<></tr> Z<><tr>Z<><th>Interdarknet ConnectivityZ<></th>Z<><td>censored access to AnoNet2 (must use AnoNet2 DNS), censored access to dn42 (must use AnoNet2 DNS)Z<></td>Z<><td>full routing to most of AnoNet1, full routing to part of dn42, full routing to VAnetZ<></td>Z<><td>censored access to AnoNet (1&2, must use SRN's DNS), censored access to VAnet (must use SRN's DNS)Z<></td>Z<><td>full routing to part of AnoNet1, full routing to AnoNet2, full routing to part of dn42Z<></td>Z<></tr> Z<><tr>Z<><th>DNS CoverageZ<></th>Z<><td>AnoNet1Z<></td>Z<><td>AnoNet (1&2), dn42, VAnet, IcannNetZ<></td>Z<><td>dn42, IcannNetZ<></td>Z<><td>AnoNet (1&2), dn42, VAnet, IcannNetZ<></td>Z<></tr> Z<><tr>Z<><th>Proxy CoverageZ<></th>Z<><td>AnoNet1Z<></td>Z<><td>AnoNet (1&2), IcannNetZ<></td>Z<><td>noneZ<></td>Z<><td>noneZ<></td>Z<></tr>