merge of '3dc1d93981365936b2cb17c676bf182493e6390b'

and '98569aeaeb4dc5708be64a6ac454c8988fac7469'

www.i2p2/pages/developerskeys.html

@@ -237,6 +237,14 @@ zbTTvOT9WqTzwHrWjNcG4rAWsG22kbvtlujy3sbgO7VckQolzm+psM
 mySqVwAzOZm9ShSxBeb99oULNQwRaW+QrGiB2mBFeCnY1kywIDAQAB
 [end]
 
+
+[pubkey dg2-new@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDtrD2xv9Hvsa+VY9
+ymQ2BgNzDenRz9xuSsrhVNqAjKVHs47J/qm7693NhnGlLxofeiF3py
+982CcCjnyEa3IfBD82dsuBgYUj09GVhcJyaA1ttNBNSCh5pDJfGFBs
+pLYjMbWl/TAdlxkWm+HgRCzhQe5vkLcx1R8nXCxmPjC0Ep3QIDAQAB
+[end]
+
 </pre>
 <h3 id="transport">Developer Transport Keys</h3>
 <p><b>Note:</b> Transport keys are only needed for setting up a <a href="monotone#operating-a-monotone-server">Monotone server</a>.</p>
@@ -403,6 +411,13 @@ At7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+5
 hMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
 [end]
 
+[pubkey dg2-transport-new@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4YQS3iFx7unaWtY
+FFX4VuT/m5o5012LF5UU9LFJmnnnPQpJzTwRrBN8WKFm5AACbg/pdR
+PzTJpv6C0kKDavKddKxc4HIuNKnTsB1qd5zOpKBNlxm6TT4N3Pdhb5
+CEXZ1lvlv4PloKFIti7ptAa4HpTs6Gd3a6nMQyHwgP0Ke44wIDAQAB
+[end]
+
 </pre>
 
 {% endblock %}

www.i2p2/pages/how_networkdatabase.html

@@ -3,7 +3,7 @@
 {% block content %}
 
 <p>
-  Updated June 2013, current as of router version 0.9.6
+  Updated October 2013, current as of router version 0.9.9
 </p>
 
 <h2>Overview</h2>
@@ -388,7 +388,7 @@ the netdb item.
   After a floodfill router receives a DatabaseStoreMessage containing a
   valid RouterInfo or LeaseSet which is newer than that previously stored in its
   local NetDb, it "floods" it.
-  To flood a NetDb entry, it looks up several (currently 4) floodfill routers closest to the routing key
+  To flood a NetDb entry, it looks up several (currently 3) floodfill routers closest to the routing key
   of the NetDb entry. (The routing key is the SHA256 Hash of the RouterIdentity or Destination with the date (yyyyMMdd) appended.)
   By flooding to those closest to the key, not closest to itself, the floodfill ensures that the storage
   gets to the right place, even if the storing router did not have good knowledge of the
@@ -546,7 +546,7 @@ the netdb item.
 
 <h3>General Mitigation Through Growth</h3>
 <p>
-  There are currently almost 100 floodfill routers in the network.
+  There are currently around 600 floodfill routers in the network.
   Most of the following attacks will become more difficult, or have less impact,
   as the network size and number of floodfill routers increase.
 </p>
@@ -554,7 +554,7 @@ the netdb item.
 
 <h3>General Mitigation Through Redundancy</h3>
 <p>
-  Via flooding, all netdb entries are stored on the 8 floodfill routers closest to the key.
+  Via flooding, all netdb entries are stored on the 3 floodfill routers closest to the key.
 </p>
 
 

www.i2p2/pages/license-agreements.html

@@ -787,6 +787,33 @@ Zf9i4Wqw8wKgkWIIbZ2+V+zP83FLcX6ga+GMr8tf/bwWjSe1PN7mZAQlPB4p8Qc=
 =NxxT
 -----END PGP SIGNATURE-----
 
+dg:
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+I affirm the following with regard to I2P:
+
+     * Unless marked otherwise, all code I commit is implicitly licensed under the component's primary license
+     * If specified in the source, the code may be explicitly licensed under one of the component's alternate licenses
+     * I have the right to release the code I commit under the terms I am committing it
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBAgAGBQJSbZwRAAoJEOLR0LYl1+FTlSIP/1+FGMm08vLk7V7v7fxKrHHf
+GOmUa5p706sVMKVjM5cgBAkd1qkon5QKwjDOOHxeN9vu2EZbicRawn19YaOOHje5
+peW4n/guYb8osflGNkBH3vy3EekB/PfuppIxjM7HeO08rJ9VrrYa6hseYvdVpMsi
+E2LtF4kMekXxOvuQI4kKL0gT+KCW7OtLWVkRzhsDqLMyP/5JG3uTcI/PAe+y2Iip
+ZZBLLkf9gBdPGOk/NeSEX510jlKqSC7TcyVnQe+BH0oLNG2SzlzeFpiTKdKObiq8
+O9rxW2yga6+7bPIgoaoxEK2zzHEGubqqHKgMUQKHs4IW3TYEGBFeCK6HUXpvObIh
+wuZK32JDZCytAzV8VcPWlA2tOInkdHZj5A5K1idvM7BLSQ2b1xzRbkflER9ZaPQ6
+NDpkz8fiJYgIU7G8CqTK/8y9bjD+zITz3yOSAM3BGax/NeIs86drovgu2B1CeE0L
+BXB/UwWZQhSE1W9AZJvbkPm4wLd9g8DihOJHArbxpEDj97W+faLGLLejm8lLB2Z5
+uBQwb4YM5Lt3FKQPqT8h6yRNtU5inIdrzbQEcKlMfOGiuKxXFlTfxAAJkOLnnK8c
+OFE4iD6nFr78yT/jo1BOOc1gs+xiq3P+Cxaa95v/F08JTwwwLqA/94PjTs57I2Ef
+cFuIq+msmE5mtJW+czFE
+=syT4
+-----END PGP SIGNATURE-----
 
 </pre>
 {% endblock %}