propagate from branch 'i2p.i2p' (head fd0e22a44acf6b018c394cdd42d75e2d1bdb4986)

to branch 'i2p.i2p.729' (head b5c7b5601c0b0e810ca6d93c1d249fe4e330a352)

debian/changelog

@@ -1,3 +1,9 @@
+i2p (0.9.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
+
 i2p (0.9.5-2) unstable; urgency=low
 
   * debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config

history.txt

@@ -1,3 +1,6 @@
+2013-05-24 kytv
+ * Update geoip.txt based on Maxmind GeoLite Country database from 2013-05-08
+
 2013-05-13 kytv
  * Misc. fixes to i2prouter script
  * German translation updates from Transifex

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -63,7 +63,7 @@ public class Reseeder {
     public static final String DEFAULT_SEED_URL =
               "http://netdb.i2p2.de/" + "," +
               "http://reseed.i2p-projekt.de/" + "," +
-              "http://euve5653.vserver.de/netDb/" +  "," +
+             //"http://euve5653.vserver.de/netDb/" +  "," +
               "http://cowpuncher.drollette.com/netdb/" + "," +
               "http://i2p.mooo.com/netDb/" + "," +
               "http://193.150.121.66/netDb/" + "," +
@@ -77,7 +77,7 @@ public class Reseeder {
     public static final String DEFAULT_SSL_SEED_URL =
               "https://netdb.i2p2.de/" + "," +
               "https://reseed.i2p-projekt.de/" + "," +
-              "https://euve5653.vserver.de/netDb/" + "," +
+              //"https://euve5653.vserver.de/netDb/" + "," +
               "https://cowpuncher.drollette.com/netdb/" + "," +
               "https://i2p.mooo.com/netDb/" + "," +
               "https://193.150.121.66/netDb/" + "," +