From 6d6799b99ec1bda5f7afa8bd6185aa697e5585c9 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 18 Jul 2011 14:33:59 +0000
Subject: [PATCH]   * Netdb:     - Add reseed hosts thx matt .at. drollette.com
     - Remove https://a.netdb.i2p2.de/, bad cert for months     - Remove
 https://c.netdb.i2p2.de/, no data for months

---
 history.txt                                    |  7 +++++++
 .../java/src/net/i2p/router/RouterVersion.java |  2 +-
 .../i2p/router/networkdb/reseed/Reseeder.java  | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/history.txt b/history.txt
index 1461bd8a12..30a9410c76 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2011-07-18 zzz
+  * FileUtil: Add a rename method and a new copy method
+  * I2PTunnel: Rename privkey file when deleting tunnel to prevent inadvertent reuse
+  * Netdb: Update reseed lists
+  * Streaming: Improve conn limit log message
+  * UDP: Lower max port below 31000 since wrapper uses that
+
 2011-07-15 zzz
   * Shutdown:
     - Cancel our JVM shutdown hook when shutting down
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5a58b19bc2..e36cd3b143 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 11;
+    public final static long BUILD = 12;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 1fb70e36db..1f6cc3aa5d 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -56,14 +56,22 @@ public class Reseeder {
      *         URLs are constructed, and because SSLEepGet doesn't follow redirects.
      */
     public static final String DEFAULT_SEED_URL =
-              "http://a.netdb.i2p2.de/,http://c.netdb.i2p2.de/," +
-              "http://reseed.i2p-projekt.de/,http://forum.i2p2.de/netdb/,http://www.i2pbote.net/netDb/,http://r31453.ovh.net/static_media/files/netDb/";
+              "http://a.netdb.i2p2.de/," +
+              "http://c.netdb.i2p2.de/," +
+              "http://reseed.i2p-projekt.de/," +
+              "http://forum.i2p2.de/netdb/," +
+              "http://www.i2pbote.net/netDb/," +
+              "http://r31453.ovh.net/static_media/files/netDb/," +
+              "http://cowpuncher.drollette.com/netdb/";
 
     /** @since 0.8.2 */
     public static final String DEFAULT_SSL_SEED_URL =
-              "https://a.netdb.i2p2.de/,https://c.netdb.i2p2.de/," +
-              "https://forum.i2p2.de/netdb/,https://www.i2pbote.net/netDb/," +
-              "https://r31453.ovh.net/static_media/files/netDb/";
+         /*   "https://a.netdb.i2p2.de/," +   bad cert */
+         /*   "https://c.netdb.i2p2.de/," +   no data */
+              "https://forum.i2p2.de/netdb/," +
+              "https://www.i2pbote.net/netDb/," +
+              "https://r31453.ovh.net/static_media/files/netDb/," +
+              "https://cowpuncher.drollette.com/netdb/";
 
     private static final String PROP_INPROGRESS = "net.i2p.router.web.ReseedHandler.reseedInProgress";
     /** the console shows this message while reseedInProgress == false */