diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild
index 07c91659c0a72b78b5130a24ea3f4b07ebe6a5a6..325f19c8465254d4d4c90bc372906ab9199ef1d1 100755
--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -128,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
#
-# requiredbuilder fucks up REALLY bad, and thinks java is perl?!
+# requiredbuilder messes up REALLY bad, and thinks java is perl?!
# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
#
# requiredbuilder -v -y -s $CWD $PKG
diff --git a/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java b/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
index d3398caaacc8a3386edc7901731cba634184b93b..ca7b8288906d227745e76410361d9e9d9952108c 100644
--- a/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
+++ b/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB.Demos.echo.echoclient;
@@ -55,7 +47,7 @@ public class Main {
// exit on anything not legal
break;
}
- c = (char)(b & 0x7f); // We only really give a fuck about ASCII
+ c = (char)(b & 0x7f); // We only care about ASCII
S = new String(S + c);
}
return S;
diff --git a/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java b/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
index 86344b1a8292338f0a3895f662d7eef725f93c78..6b7be251824859555928c5798114bbd16e7b37fd 100644
--- a/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
+++ b/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB.Demos.echo.echoserver;
@@ -52,7 +44,7 @@ public class Main {
if(b < 20) {
break;
}
- c = (char)(b & 0x7f); // We only really give a fuck about ASCII
+ c = (char)(b & 0x7f); // We only care about ASCII
S = new String(S + c);
}
return S;
diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java
index 0b55eb532d261a900bfa34b45b3f170314775529..517146dac1d60cbfe597acc04094a4e7da480b40 100644
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
index 38bb60ca6e5452d314f9b8f56e947285866ab330..85be6e9ea261a11512d4bc6d5ee2edb7751c13c7 100644
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
index a94a40b7e13245a7d9581add53ef5f8f959b9589..05b12fcd349a94743b9a240b0d45cde8532a4f3f 100644
--- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java
+++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
index 4c186700f65a71f4ca188f4910eb27a3d08674e5..bf699db60e62587e84c8878474a3c788e45c3dbf 100644
--- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
+++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/Lifted.java b/apps/BOB/src/net/i2p/BOB/Lifted.java
index fbd23cba5feb7dedf9b5cb25d57335baa0dbfe57..47268243677aea05d4ec7c1d2d21a9fc851beb52 100644
--- a/apps/BOB/src/net/i2p/BOB/Lifted.java
+++ b/apps/BOB/src/net/i2p/BOB/Lifted.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
index 7d1e6478fba3e4dd690f489dc310c780fe9b624d..faaf2899a95615b9cddcbcadf9ac76a7f6e34426 100644
--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
@@ -302,14 +294,14 @@ public class MUXlisten implements Runnable {
// Hopefully nuke stuff here...
{
- String boner = tg.getName();
+ String groupName = tg.getName();
try {
- _log.warn("destroySocketManager " + boner);
+ _log.warn("destroySocketManager " + groupName);
socketManager.destroySocketManager();
- _log.warn("destroySocketManager Successful" + boner);
+ _log.warn("destroySocketManager Successful" + groupName);
} catch (Exception e) {
// nop
- _log.warn("destroySocketManager Failed" + boner);
+ _log.warn("destroySocketManager Failed" + groupName);
_log.warn(e.toString());
}
}
@@ -333,25 +325,25 @@ public class MUXlisten implements Runnable {
// Wait around till all threads are collected.
if (tg != null) {
- String boner = tg.getName();
- // System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner);
- _log.warn("BOB: MUXlisten: Starting thread collection for: " + boner);
+ String groupName = tg.getName();
+ // System.out.println("BOB: MUXlisten: Starting thread collection for: " + groupName);
+ _log.warn("BOB: MUXlisten: Starting thread collection for: " + groupName);
if (tg.activeCount() + tg.activeGroupCount() != 0) {
- // visit(tg, 0, boner);
+ // visit(tg, 0, groupName);
int foo = tg.activeCount() + tg.activeGroupCount();
// hopefully no longer needed!
// int bar = lives;
- // System.out.println("BOB: MUXlisten: Waiting on threads for " + boner);
- // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
- // visit(tg, 0, boner);
- // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+ // System.out.println("BOB: MUXlisten: Waiting on threads for " + groupName);
+ // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
+ // visit(tg, 0, groupName);
+ // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
// Happily spin forever :-(
while (foo != 0) {
foo = tg.activeCount() + tg.activeGroupCount();
// if (lives != bar && lives != 0) {
- // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
- // visit(tg, 0, boner);
- // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+ // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
+ // visit(tg, 0, groupName);
+ // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
// }
// bar = lives;
try {
@@ -361,8 +353,8 @@ public class MUXlisten implements Runnable {
}
}
}
- // System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner);
- _log.warn("BOB: MUXlisten: Threads went away. Success: " + boner);
+ // System.out.println("BOB: MUXlisten: Threads went away. Success: " + groupName);
+ _log.warn("BOB: MUXlisten: Threads went away. Success: " + groupName);
tg.destroy();
// Zap reference to the ThreadGroup so the JVM can GC it.
tg = null;
diff --git a/apps/BOB/src/net/i2p/BOB/Main.java b/apps/BOB/src/net/i2p/BOB/Main.java
index 099d01636244980f753853f1edeba6c01e1dcb0f..89fd9548939d9b1d4bda091272a9b1f7b6fc50ba 100644
--- a/apps/BOB/src/net/i2p/BOB/Main.java
+++ b/apps/BOB/src/net/i2p/BOB/Main.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/NamedDB.java b/apps/BOB/src/net/i2p/BOB/NamedDB.java
index b5189647bc72fc033a2a25c60afe7690d579fced..46796136dd51baeef1a389ab6e7a6c76a425ec4d 100644
--- a/apps/BOB/src/net/i2p/BOB/NamedDB.java
+++ b/apps/BOB/src/net/i2p/BOB/NamedDB.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java
index ca3e5c833cd026590736ec02800d95b4652d4df6..e684d5327847c65d2649a4e0b478006287377192 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPio.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPio.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
index 35227481a266eb58e47831692f3f34ec5dc191e5..90fff591794a63a12b3c9965c78328138042e784 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
index 05d3f5b651890242f1024cd2babeba1555e5b072..d83c061a0075169b8c646eb9464c1bf0c8bfd234 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
@@ -94,7 +86,7 @@ public class TCPtoI2P implements Runnable {
// exit on anything not legal
break;
}
- c = (char) (b & 0x7f); // We only really give a fuck about ASCII
+ c = (char) (b & 0x7f); // We only care about ASCII
S = new String(S + c);
}
return S;
diff --git a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
index b421a6a945d7ef0a3f186fdc9e9d605e99820a11..e5c753f5e15d0a611fe873b65b8a9f9e7fb2d03f 100644
--- a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
+++ b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,7 +11,7 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
package net.i2p.BOB;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java
index 8c188d11576416a80082bc3409116a0b90cd6981..56c2e7550c4242fb5146880a2968f198972f2f6c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java
@@ -1,17 +1,9 @@
/**
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ * WTFPL
* Version 2, December 2004
*
* Copyright (C) sponge
* Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
*
* See...
*
@@ -19,9 +11,8 @@
* and
* http://en.wikipedia.org/wiki/WTFPL
*
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
*/
-
package net.i2p.i2ptunnel;
// import java.util.ArrayList;
diff --git a/history.txt b/history.txt
index 9c8c5a6fc2fca92535397b2da2266e3207cfa1bd..2e6a34f9eaf155e19afe9d5d547014dedf4f73be 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2012-10-30 sponge
+ * cleanups as requested
+
2012-10-28 zzz
* Addresses:
- Add methods for connectivity detection
diff --git a/installer/resources/certificates/i2p.feared.eu.crt b/installer/resources/certificates/i2p.feared.eu.crt
new file mode 100644
index 0000000000000000000000000000000000000000..628c6290ce352146dca054edd0f541d1f410a877
--- /dev/null
+++ b/installer/resources/certificates/i2p.feared.eu.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDhTCCAm2gAwIBAgIJAPVgXcMcr3zqMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
+BAYTAkVVMQ8wDQYDVQQIDAZFdXJvcGUxDDAKBgNVBAoMA0kyUDETMBEGA1UECwwK
+T3V0cHJveGllczEWMBQGA1UEAwwNaTJwLmZlYXJlZC5ldTAeFw0xMjEwMjkxNzMw
+MDZaFw0yMTAxMTUxNzMwMDZaMFkxCzAJBgNVBAYTAkVVMQ8wDQYDVQQIDAZFdXJv
+cGUxDDAKBgNVBAoMA0kyUDETMBEGA1UECwwKT3V0cHJveGllczEWMBQGA1UEAwwN
+aTJwLmZlYXJlZC5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOUh
+y2+6Q4RO+b5WPXX/cZ/9fiI7aWGe/C7z0083HOEqnkgGCYgxFWUCed6/eZbYoZ7/
+PV1BAuEereNwTp+Ov7fQB2H73O9sSAEejW6O4C2PZiZWaPxpZiTJNENbLOZxJnIN
++fSqmA5pqvGkYAJ2heZH4v4tayun7Vib58GWuizhzJ4EvhOrOrLq/YHrxMn++r4e
+kNNbq4QzWpfxNa7ocDY9OJh5qFzuc+6wKj1m1syK6euDqs5d6X+y0aDTMgRxey2b
+tkmNx9wC0flLg1oMcv9o1zN+dENy7Inkd/SqbSjLUqDTJzdq6xURVsgLoV63pb6r
+B4gbGIlriYWK/mOPTTkCAwEAAaNQME4wHQYDVR0OBBYEFOI94JZ3Rb2RVmr8QjOp
+u3KfVSrNMB8GA1UdIwQYMBaAFOI94JZ3Rb2RVmr8QjOpu3KfVSrNMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAD7bI05zg9nf9qanq4ZNw/rvEzYQRBmy
+MqzZjcwBMGvbcEbS+zYAdAkfxmN3l/AT4I4z138Om0ud4ZJUQTVlRsJkMlmLD4Rt
+Jbi2rl7mrY7Qupgu5hvgH+ZaEWr7LTq+tFjPycRS+zijw9NToKeAsgEex9zYIOYD
+BxDUn/trvyA41ItvegWh803IsZUBb45Via+bopid9aFFkejRrck9hhcQ6fVh2yju
+nuVwHrxNvGc0NmmJ7zI+nPESFS+TAYbWXikDhc5Vtyiuoz47WZU1cgXYYMejK4WA
++3GLvei7qKm4GOJSg7BngF5Iyj/n7ML1rBqTlN3KA1YOgpGCwJlKzto=
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/reseed.info.crt b/installer/resources/certificates/reseed.info.crt
new file mode 100644
index 0000000000000000000000000000000000000000..31302c52bd6b87aeca9f40071cda8bfafbba7d6f
--- /dev/null
+++ b/installer/resources/certificates/reseed.info.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDRDCCAiwCCQDCm/Zrmali9zANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJB
+VTETMBEGA1UECBMKU29tZS1TdGF0ZTELMAkGA1UEBxMCSEgxDDAKBgNVBAoTA0ky
+UDEPMA0GA1UECxMGcmVzZWVkMRQwEgYDVQQDEwtyZXNlZWQuaW5mbzAeFw0xMjEw
+MjcxODU3NDNaFw0xNjEyMDUxODU3NDNaMGQxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
+EwpTb21lLVN0YXRlMQswCQYDVQQHEwJISDEMMAoGA1UEChMDSTJQMQ8wDQYDVQQL
+EwZyZXNlZWQxFDASBgNVBAMTC3Jlc2VlZC5pbmZvMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAt9nz0iUvjdX4Hkhfk0FbBOeEP4i/FG3V4VrEdQfcviSF
+XgzGYeRtGsvrFWP/5+6bcGnOkIy/jrKJfij3AjKJh8gTzqiNNNnV8VcHwFSNp+hZ
+D4BM+UHPACV1Pjd3HQe6f0+LvcTs3HQgIkNkwUyqRuXOm/5Mk6SWSu1740aSwHCj
+Kk0x1FByzI0YBvXCPX6TVk6sJqKkQyLzK0CSGSeqUq8GvGCq+jT9k62Su7ooxCwi
+GzxaFjMdVYxuI8cuT5Cni+SUw1Ia8vhESnIy6slwzk37xNI80VuMvRT6rD2KcXDH
+mK7ml1qL0rJWoF5AE+x/nen4V41mouv1W9rk3wTlTQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAr6RBviBDW4bnPDTcdtstTDdaYX9yzoh+zzeGB0dUR26GKoOjpSItb
+B9nrsW1eJ2wbblfGBUoXhcmNByKHXXHejMhmurHjdei2BuLbTsknN8DPKXu5UF9z
+cg4cKQkxgzXOcNYlaF4+sfwFXDHJ4we/8vduVgkyo8R66543/Sh/nIMvq2slRT4w
+wIBOVcMb2XxlbdwHW9XALAz9sto+4GH9GAC24f8ngluOpHijMnOOIo4dHibQ5hM9
+KcDpHezP0ugMTAxS2NmtVahwAqa2IjpqR7aEQ2wLvxQzDqrXo93L93+b2FKRUQXH
+Duud/n/w0kVV3DaIGikOsJayoanR+9HD
+-----END CERTIFICATE-----
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 d760624d53016d14daad608a5376f30874abd9e4..b588f9c1659591772a4f24109be0c0edf2920435 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -68,7 +68,9 @@ public class Reseeder {
"http://cowpuncher.drollette.com/netdb/" + "," +
"http://i2p.mooo.com/netDb/" + "," +
"http://193.150.121.66/netDb/" + "," +
- "http://netdb.i2p2.no/";
+ "http://netdb.i2p2.no/" + "," +
+ "http://reseed.info/" + "," +
+ "http://i2p.feared.eu/";
/** @since 0.8.2 */
public static final String DEFAULT_SSL_SEED_URL =
@@ -80,7 +82,9 @@ public class Reseeder {
"https://cowpuncher.drollette.com/netdb/" + "," +
"https://i2p.mooo.com/netDb/" + "," +
"https://193.150.121.66/netDb/" + "," +
- "https://netdb.i2p2.no/";
+ "https://netdb.i2p2.no/" + "," +
+ "https://reseed.info/" + "," +
+ "https://i2p.feared.eu/";
public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
public static final String PROP_PROXY_PORT = "router.reseedProxyPort";