* Reseed:

- Restore i2pbote (ticket #516)
    - Remove r31453 (cert expiring, host soon to be shut down permanently)

history.txt

@@ -1,3 +1,9 @@
+2011-11-27 zzz
+  * IRCClient: Outbound whitelist optimization
+  * Reseed:
+    - Restore i2pbote (ticket #516)
+    - Remove r31453 (cert expiring, host soon to be shut down permanently)
+
 2011-11-26 zzz
   * DCCServer: Socket error log fix
   * NTCP: Fix pumper NPE (ticket #555)

installer/resources/certificates/r31453.ovh.net

@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFODCCAyACCQDjoZjFpBtqgzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMRcwFQYDVQQDEw5yMzE0NTMub3ZoLm5ldDAeFw0xMDEyMTMxNjQ3
-MDJaFw0xMTEyMTMxNjQ3MDJaMF4xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
-LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFzAVBgNV
-BAMTDnIzMTQ1My5vdmgubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAxmNPRiG6EjklwIxmoy3ziKrj84dy6HwZ6J/HmKrAf36akRiglzSLbcC5GAN6
-cnwnEdEEhUhC9LDBgZ5yvGgkVXIDA6YUn80kboon8ZLfUM3/yQqd/9pMBXgyNymr
-ES9a6kU4NQQSj7nvE2a4fVKQqzhTA6pBD4Q+zJ9T35QvsmyfKUmFgpTX/vAyPivF
-YGWUhRXFpNdXHTq6RYOn1iw4NMT4COR2en1i/p4AZNxlvu6HUShJ68oexLdcCWrt
-BruHCDgKkVcWtJnQ4q7z7kxcAiBiHdDzSmHC9zCEEz9FEc4nhJXXGM+LY0NjoXkk
-V+q7tOJBli0llmHwnWN737OFMlXd5AdooJsOq9Nk4oIn8aK3h5/VkCcCkSXaOzO5
-wroNZ/DzEYgR+0YddN0ey7iosjE/7dQwIJpO8LDQR/ZYX9VLUnBNcZGdJcQ0sloa
-nlBUHBmi+n85LjFBNnphDWnSa4SUnR2eAtJRtGLHRn9ZtKRHh5FLLsFbXhdkB6Fl
-/trmcjohUuC+2FtRM4F0L86atCOm1CkCjPg/db4l3SCFYbe/n+txnQwcyvJtKCpi
-6bepZV2vpGNVeJKi2kivmMF0toO5SLM78F4pcgdxvU9myNsLrEf1M+n4gq9pZg0d
-zuw2lc1l1iYA80zoTjKd9bggfcROjZxu4HxbzTIblHVcCosCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAgEAXsDA+XYokPoHrur1M/w69vXz2DciW3eEcoYEw6wDNxJfyo9S
-9JQo3ke22G9VRPW0yAZL0dfx0dB1kwdyDq1kOcddrjfNDwZdclUl9PklZG1wR3sf
-v0/fNoVIpJiD3dJUWf//Q8CtiRJFL93cCj//pHeryncZzd4my04wBiS7I/7tLDOo
-APpn3k7yJelrV7N0/Mx8ReKQGSj8xyKABCFLyCSghkU2ujlbBAfOAsrklHNnS7KT
-IWHYzMW3pSPMIGU9Ub/7KszhDWRQwK76Rx6IARDRJAuhpAMhO1bVJB3QH49xR2El
-lvspP+3NqYPAGXEi3G3Rny7seFcLKWxPmv3I02Q/iGs1axx5FoW8V0sWpp7l4Ps7
-bwcwo1PD5SN/LQGpt87dut9L3reGpW91rL+xUGB2nLCZf5686/zSM9lwKlgm6+Jv
-d4WoseuKFUEQUIC5y6kUs1J2KbdYSjn73h9u2bmVlBF7bjRCcQ26Ad2buFjctFSF
-ozd8TPLy6EyI9L8D855iJtq3JO76+J8EBFofYTwuHTqMzyX6lu3BomIZWpVVDTsv
-goSsVubtYfymy9xfqT50SgrCbz5RnfF0/D30cV4ePgTMKDjEKY3BMP+TiBNacQo3
-oz2jAqmudtPOTnIpjmN3hVk+WgpZbWVZNCVpCiskr+lPOxWV1EK9YW7PqiE=
------END CERTIFICATE-----

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 = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "";

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

@@ -63,8 +63,8 @@ public class Reseeder {
               "http://netdb.i2p2.de/" + "," +
               "http://reseed.i2p-projekt.de/" + "," +
               "http://forum.i2p2.de/netdb/" + "," +
-         /*   "http://www.i2pbote.net/netDb/," +   NO DATA */
-              "http://r31453.ovh.net/static_media/files/netDb/" + "," +
+              "http://www.i2pbote.net/netDb/" +  "," +
+          //  "http://r31453.ovh.net/static_media/files/netDb/" + "," +
               "http://cowpuncher.drollette.com/netdb/" + "," +
               "http://75.145.125.59/netDb/" + "," +
               "http://i2p.mooo.com/netDb/";
@@ -73,9 +73,9 @@ public class Reseeder {
     public static final String DEFAULT_SSL_SEED_URL =
               "https://netdb.i2p2.de/" + "," +
               "https://forum.i2p2.de/netdb/" + "," +
-         /*   "https://www.i2pbote.net/netDb/," +   NO DATA */
+              "https://www.i2pbote.net/netDb/" + "," +
               "https://reseed.i2p-projekt.de/" + "," +
-              "https://r31453.ovh.net/static_media/files/netDb/" + "," +
+          //  "https://r31453.ovh.net/static_media/files/netDb/" + "," +
               "https://cowpuncher.drollette.com/netdb/" + "," +
               "https://75.145.125.59/netDb/" + "," +
               "https://i2p.mooo.com/netDb/";