# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1290488405 -3600
# Node ID 16c5e9d0b6f5ee9ef7cf73aa065e7885ca4ae8aa
# Parent  c2fd9474a3c2eec3e48aa518ee1ed6513c98dfa1# Parent  4d03d8de7eac13d6b5d7adbcc366376c782a4cda
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r c2fd9474a3c2 -r 16c5e9d0b6f5 doc/www.anonet2.org/public_pod/darknet_comparison.pod
--- a/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Tue Nov 23 00:00:03 2010 +0100
+++ b/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Tue Nov 23 06:00:05 2010 +0100
@@ -39,12 +39,12 @@
  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>20-30Z<></td>Z<><td>~15Z<></td>Z<><td>40-50Z<></td>Z<><td>&lt;5Z<></td>Z<></tr>
- Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~20%Z<></td>Z<><td>~5%Z<></td>Z<><td>~10%Z<></td>Z<></tr>
+ Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>15-25Z<></td>Z<><td>15-20Z<></td>Z<><td>40-50Z<></td>Z<><td>&lt;5Z<></td>Z<></tr>
+ Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>-10%Z<></td>Z<><td>~20%Z<></td>Z<><td>~5%Z<></td>Z<><td>~0%Z<></td>Z<></tr>
  Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>mediumZ<></td>Z<><td>mediumZ<></td>Z<><td>mediumZ<></td>Z<><td>lowZ<></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 part of AnoNet1, full routing to part of dn42, full routing to VAnetZ<></td>Z<><td>censored access to AnoNet (1&amp;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>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&amp;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&amp;2), dn42, VAnet, IcannNetZ<></td>Z<><td>dn42, IcannNetZ<></td>Z<><td>AnoNet (1&amp;2), dn42, VAnet, IcannNetZ<></td>Z<></tr>
- Z<><tr>Z<><th>Peering PrerequisitesZ<></th>Z<><td>OpenVPN, BGP daemon, sustained IRC participation for over a monthZ<></td>Z<><td>OpenVPN or tinc or L<quicktun|http://wiki.ucis.nl/QuickTun>, BGP daemon or static routingZ<></td>Z<><td>OpenVPN, BGP daemon or static routingZ<></td>Z<><td>depends on individual PoP policyZ<></td>Z<></tr>
+ Z<><tr>Z<><th>Peering PrerequisitesZ<></th>Z<><td>OpenVPN, BGP daemon, sustained IRC participation for over a month, and a miracleZ<></td>Z<><td>OpenVPN or tinc or L<quicktun|http://wiki.ucis.nl/QuickTun>, BGP daemon or static routingZ<></td>Z<><td>OpenVPN, BGP daemon or static routingZ<></td>Z<><td>depends on individual PoP policyZ<></td>Z<></tr>
  Z<><tr>Z<><th colspan='5'>ServicesZ<></th>Z<></tr>
  Z<><tr>Z<><td>&nbspZ<></td>Z<><th>AnoNet1Z<></th>Z<><th>AnoNet2Z<></th>Z<><th>dn42Z<></th>Z<><th>VAnetZ<></th>Z<></tr>
  Z<><tr>Z<><th>RoutingZ<></th>Z<><td>decentralizedZ<></td>Z<><td>decentralizedZ<></td>Z<><td>decentralizedZ<></td>Z<><td>centralizedZ<></td>