0.9.24

Fixups after review:
Fix arraycopy argument order in unused SocksHeader Add deleted reseed cert to deletelist.txt Fix minimum version for SSU extended options
2016-01-27 14:18:08 +00:00 · 2016-01-27 13:26:22 +00:00 · 2016-01-25 05:09:12 +00:00 · 2016-01-25 05:08:24 +00:00 · 2016-01-25 05:05:25 +00:00 · 2016-01-25 05:00:23 +00:00
2561 changed files with 457138 additions and 279197 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# Just to try and prevent some noob disasters.
+# Use git add -f foo.jar to ignore this ignore list
+
+# generated release files
+*.exe
+*.[gx]z
+*.bz2
+*.[rwjt]ar
+*.sig
+*.su[d23]
+*.deb
+*.zip
+*.torrent
+
+*~
+web-fragment.xml
+web-out.xml
+*.out
+
+# Temporary/build dirs
+build/
+pkg-temp/
+classes/
+dist/
+/installer/resources/locale/mo
+/tmp
+/apps/jetty/jettylib
+*_jsp.java
+*.class
+
+# Debian-related
+/debian/copyright
+/debian/changelog
+.pc/
+
+# Build property overrides
+/override.properties
+
+# Reporting
+*.fba
+sloccount.sc
+/reports/
+
+# Don't allow patches
+*.(diff|patch)
+
+# but allow debian/patches
+!/debian/patches/*.(patch|diff)
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -1,7 +1,10 @@
 # Just to try and prevent some noob disasters.
 # Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+
+# Temporary/build files
 _jsp\.java$
 \.bz2$
+\.tar$
 \.class$
 \.diff$
 \.exe$
@@ -13,14 +16,35 @@ _jsp\.java$
 \.sig$
 \.sud$
 \.su2$
+.\su3$
 \.tar$
 \.war$
+.\deb$
 \.zip$
+\.torrent$
 ^\.
-^build/
-^pkg-temp/
 ~$
-/build/
-/classes/
+web-fragment.xml
+web-out.xml
+
+# Temporary/build dirs
+^build
+^pkg-temp
+/build
+/classes
+/dist
+^installer/resources/locale/mo
+/tmp
+^apps/jetty/jettylib
+
+# Debian-related
 ^debian/copyright
+^debian/changelog
+^.pc/
+
+# Build property overrides
 override.properties
+
+# Reporting
+sloccount.sc
+^reports/
--- a/.tx/config
+++ b/.tx/config
@@ -7,13 +7,48 @@ trans.da = apps/i2ptunnel/locale/messages_da.po
 trans.de = apps/i2ptunnel/locale/messages_de.po
 trans.es = apps/i2ptunnel/locale/messages_es.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
+trans.hu = apps/i2ptunnel/locale/messages_hu.po
 trans.it = apps/i2ptunnel/locale/messages_it.po
+trans.ja = apps/i2ptunnel/locale/messages_ja.po
+trans.nb = apps/i2ptunnel/locale/messages_nb.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
-trans.ru = apps/i2ptunnel/locale/messages_ru.po
+trans.nn = apps/i2ptunnel/locale/messages_nn.po
+trans.pl = apps/i2ptunnel/locale/messages_pl.po
+trans.pt = apps/i2ptunnel/locale/messages_pt.po
+trans.pt_BR = apps/i2ptunnel/locale/messages_pt_BR.po
+trans.ro = apps/i2ptunnel/locale/messages_ro.po
+trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
+trans.sk = apps/i2ptunnel/locale/messages_sk.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
 trans.vi = apps/i2ptunnel/locale/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po
+trans.zh_TW = apps/i2ptunnel/locale/messages_zh_TW.po
+
+[I2P.proxy]
+source_file = apps/i2ptunnel/locale-proxy/messages_en.po
+source_lang = en
+trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
+trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
+trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
+trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
+trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
+;; Java converts id to in
+trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
+trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
+trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
+trans.pl = apps/i2ptunnel/locale-proxy/messages_pl.po
+trans.pt = apps/i2ptunnel/locale-proxy/messages_pt.po
+trans.pt_BR = apps/i2ptunnel/locale-proxy/messages_pt_BR.po
+trans.ro = apps/i2ptunnel/locale-proxy/messages_ro.po
+trans.ru_RU = apps/i2ptunnel/locale-proxy/messages_ru.po
+trans.sk = apps/i2ptunnel/locale-proxy/messages_sk.po
+trans.sv_SE = apps/i2ptunnel/locale-proxy/messages_sv.po
+trans.uk_UA = apps/i2ptunnel/locale-proxy/messages_uk.po
+trans.vi = apps/i2ptunnel/locale-proxy/messages_vi.po
+trans.zh_CN = apps/i2ptunnel/locale-proxy/messages_zh.po

 [I2P.routerconsole]
 source_file = apps/routerconsole/locale/messages_en.po
@@ -22,18 +57,89 @@ trans.ar = apps/routerconsole/locale/messages_ar.po
 trans.cs = apps/routerconsole/locale/messages_cs.po
 trans.da = apps/routerconsole/locale/messages_da.po
 trans.de = apps/routerconsole/locale/messages_de.po
-trans.et_EE = apps/routerconsole/locale/messages_ee.po
+trans.el = apps/routerconsole/locale/messages_el.po
 trans.es = apps/routerconsole/locale/messages_es.po
+trans.et_EE = apps/routerconsole/locale/messages_et.po
 trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
+trans.hu = apps/routerconsole/locale/messages_hu.po
 trans.it = apps/routerconsole/locale/messages_it.po
+trans.ja = apps/routerconsole/locale/messages_ja.po
+trans.nb = apps/routerconsole/locale/messages_nb.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
 trans.pl = apps/routerconsole/locale/messages_pl.po
-trans.ru = apps/routerconsole/locale/messages_ru.po
+trans.pt = apps/routerconsole/locale/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale/messages_ru.po
 trans.sv_SE = apps/routerconsole/locale/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale/messages_uk.po
 trans.vi = apps/routerconsole/locale/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale/messages_zh.po
+trans.zh_TW = apps/routerconsole/locale/messages_zh_TW.po
+
+[I2P.welcome]
+source_file = apps/routerconsole/locale-news/messages_en.po
+source_lang = en
+trans.ar = apps/routerconsole/locale-news/messages_ar.po
+trans.de = apps/routerconsole/locale-news/messages_de.po
+trans.es = apps/routerconsole/locale-news/messages_es.po
+trans.fi = apps/routerconsole/locale-news/messages_fi.po
+trans.fr = apps/routerconsole/locale-news/messages_fr.po
+trans.he = apps/routerconsole/locale-news/messages_he.po
+;; Java converts id to in
+trans.id = apps/routerconsole/locale-news/messages_in.po
+trans.it = apps/routerconsole/locale-news/messages_it.po
+trans.ja = apps/routerconsole/locale-news/messages_ja.po
+trans.ko = apps/routerconsole/locale-news/messages_ko.po
+trans.mg = apps/routerconsole/locale-news/messages_mg.po
+trans.nb = apps/routerconsole/locale-news/messages_nb.po
+trans.nl = apps/routerconsole/locale-news/messages_nl.po
+trans.pl = apps/routerconsole/locale-news/messages_pl.po
+trans.pt = apps/routerconsole/locale-news/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-news/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
+trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sq = apps/routerconsole/locale-news/messages_sq.po
+trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
+trans.uk_UA = apps/routerconsole/locale-news/messages_uk.po
+trans.zh_CN = apps/routerconsole/locale-news/messages_zh.po
+trans.zh_TW = apps/routerconsole/locale-news/messages_zh_TW.po
+
+[I2P.countries]
+type = PO
+source_file = apps/routerconsole/locale-countries/messages_en.po
+source_lang = en
+trans.ca = apps/routerconsole/locale-countries/messages_ca.po
+trans.da = apps/routerconsole/locale-countries/messages_da.po
+trans.de = apps/routerconsole/locale-countries/messages_de.po
+trans.el = apps/routerconsole/locale-countries/messages_el.po
+trans.es = apps/routerconsole/locale-countries/messages_es.po
+trans.et_EE = apps/routerconsole/locale-countries/messages_et.po
+trans.fi = apps/routerconsole/locale-countries/messages_fi.po
+trans.fr = apps/routerconsole/locale-countries/messages_fr.po
+trans.hu = apps/routerconsole/locale-countries/messages_hu.po
+trans.it = apps/routerconsole/locale-countries/messages_it.po
+trans.ja = apps/routerconsole/locale-countries/messages_ja.po
+trans.mg = apps/routerconsole/locale-countries/messages_mg.po
+trans.nb = apps/routerconsole/locale-countries/messages_nb.po
+trans.nl = apps/routerconsole/locale-countries/messages_nl.po
+trans.pl = apps/routerconsole/locale-countries/messages_pl.po
+trans.pt = apps/routerconsole/locale-countries/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-countries/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-countries/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-countries/messages_ru.po
+trans.sk = apps/routerconsole/locale-countries/messages_sk.po
+trans.sq = apps/routerconsole/locale-countries/messages_sq.po
+trans.sv_SE = apps/routerconsole/locale-countries/messages_sv.po
+trans.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
+trans.tr_TR = apps/routerconsole/locale-countries/messages_tr.po
+trans.vi = apps/routerconsole/locale-countries/messages_vi.po
+trans.zh_CN = apps/routerconsole/locale-countries/messages_zh.po
+trans.zh_TW = apps/routerconsole/locale-countries/messages_zh_TW.po

 [I2P.i2psnark]
 source_file = apps/i2psnark/locale/messages_en.po
@@ -43,11 +149,16 @@ trans.cs = apps/i2psnark/locale/messages_cs.po
 trans.de = apps/i2psnark/locale/messages_de.po
 trans.es = apps/i2psnark/locale/messages_es.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
+trans.hu = apps/i2psnark/locale/messages_hu.po
 trans.it = apps/i2psnark/locale/messages_it.po
+trans.nb = apps/i2psnark/locale/messages_nb.po
 trans.nl = apps/i2psnark/locale/messages_nl.po
 trans.pl = apps/i2psnark/locale/messages_pl.po
 trans.pt = apps/i2psnark/locale/messages_pt.po
-trans.ru = apps/i2psnark/locale/messages_ru.po
+trans.pt_BR = apps/i2psnark/locale/messages_pt_bR.po
+trans.ro = apps/i2psnark/locale/messages_ro.po
+trans.ru_RU = apps/i2psnark/locale/messages_ru.po
+trans.sk = apps/i2psnark/locale/messages_sk.po
 trans.sv_SE = apps/i2psnark/locale/messages_sv.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po
@@ -59,13 +170,20 @@ trans.ar = apps/susidns/locale/messages_ar.po
 trans.cs = apps/susidns/locale/messages_cs.po
 trans.da = apps/susidns/locale/messages_da.po
 trans.de = apps/susidns/locale/messages_de.po
+trans.el = apps/susidns/locale/messages_el.po
 trans.es = apps/susidns/locale/messages_es.po
 trans.fr = apps/susidns/locale/messages_fr.po
+trans.hu = apps/susidns/locale/messages_hu.po
 trans.it = apps/susidns/locale/messages_it.po
+trans.ja = apps/susidns/locale/messages_ja.po
 trans.nl = apps/susidns/locale/messages_nl.po
 trans.pl = apps/susidns/locale/messages_pl.po
-trans.ru = apps/susidns/locale/messages_ru.po
+trans.pt = apps/susidns/locale/messages_pt.po
+trans.pt_BR = apps/susidns/locale/messages_pt_BR.po
+trans.ro = apps/susidns/locale/messages_ro.po
+trans.ru_RU = apps/susidns/locale/messages_ru.po
 trans.sv_SE = apps/susidns/locale/messages_sv.po
+trans.tr_TR = apps/susidns/locale/messages_tr.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
@@ -77,14 +195,21 @@ trans.ar = apps/desktopgui/locale/messages_ar.po
 trans.cs = apps/desktopgui/locale/messages_cs.po
 trans.da = apps/desktopgui/locale/messages_da.po
 trans.de = apps/desktopgui/locale/messages_de.po
+trans.el = apps/desktopgui/locale/messages_el.po
 trans.es = apps/desktopgui/locale/messages_es.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
+trans.hu = apps/desktopgui/locale/messages_hu.po
 trans.it = apps/desktopgui/locale/messages_it.po
+trans.ja = apps/desktopgui/locale/messages_ja.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
 trans.pl = apps/desktopgui/locale/messages_pl.po
-trans.ru = apps/desktopgui/locale/messages_ru.po
+trans.pt_BR = apps/desktopgui/locale/messages_pt_BR.po
+trans.ro = apps/desktopgui/locale/messages_ro.po
+trans.ru_RU = apps/desktopgui/locale/messages_ru.po
+trans.sk = apps/desktopgui/locale/messages_sk.po
 trans.sv_SE = apps/desktopgui/locale/messages_sv.po
 trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.tr_TR = apps/desktopgui/locale/messages_tr.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po

@@ -92,14 +217,25 @@ trans.zh_CN = apps/desktopgui/locale/messages_zh.po
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
 trans.cs = apps/susimail/locale/messages_cs.po
+trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
+trans.hu = apps/susimail/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/susimail/locale/messages_in.po
 trans.it = apps/susimail/locale/messages_it.po
+trans.ja = apps/susimail/locale/messages_ja.po
+trans.mg = apps/susimail/locale/messages_mg.po
 trans.nl = apps/susimail/locale/messages_nl.po
-trans.ru = apps/susimail/locale/messages_ru.po
-trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.pl = apps/susimail/locale/messages_pl.po
+trans.pt = apps/susimail/locale/messages_pt.po
+trans.pt_BR = apps/susimail/locale/messages_pt_BR.po
+trans.ro = apps/susimail/locale/messages_ro.po
+trans.ru_RU = apps/susimail/locale/messages_ru.po
+trans.sq = apps/susimail/locale/messages_sq.po
+trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
@@ -109,12 +245,105 @@ source_file = debian/po/templates.pot
 source_lang = en
 trans.cs = debian/po/cs.po
 trans.de = debian/po/de.po
+trans.el = debian/po/el.po
 trans.es = debian/po/es.po
+trans.fi = debian/po/fi.po
+trans.fr = debian/po/fr.po
+trans.id = debian/po/id.po
+trans.it = debian/po/it.po
+trans.hu = debian/po/hu.po
+trans.ja = debian/po/ja.po
+trans.ko = debian/po/ko.po
+trans.nl = debian/po/nl.po
 trans.pl = debian/po/pl.po
-trans.ru = debian/po/ru.po
+trans.pt = debian/po/pt.po
+trans.pt_BR = debian/po/pt_BR.po
+trans.ro = debian/po/ro.po
+trans.ru_RU = debian/po/ru.po
+trans.sk = debian/po/sk.po
+trans.sq = debian/po/sq.po
 trans.sv_SE = debian/po/sv.po
 trans.uk_UA = debian/po/uk.po
+trans.tr_TR = debian/po/tr.po
+trans.zh_CN = debian/po/zh.po
+
+[I2P.i2prouter-script]
+source_file = installer/resources/locale/po/messages_en.po
+source_lang = en
+;; currently fails check
+;;trans.ca = installer/resources/locale/po/messages_ca.po
+trans.de = installer/resources/locale/po/messages_de.po
+trans.es = installer/resources/locale/po/messages_es.po
+;; currently fails check
+;;trans.fi = installer/resources/locale/po/messages_fi.po
+trans.fr = installer/resources/locale/po/messages_fr.po
+trans.id = installer/resources/locale/po/messages_id.po
+trans.it = installer/resources/locale/po/messages_it.po
+trans.pl = installer/resources/locale/po/messages_pl.po
+trans.ja = installer/resources/locale/po/messages_ja.po
+;; currently fails check
+;;trans.ko = installer/resources/locale/po/messages_ko.po
+trans.nl = installer/resources/locale/po/messages_nl.po
+trans.pl = installer/resources/locale/po/messages_pl.po
+trans.pt = installer/resources/locale/po/messages_pt.po
+trans.pt_BR = installer/resources/locale/po/messages_pt_BR.po
+trans.ro = installer/resources/locale/po/messages_ro.po
+trans.ru_RU = installer/resources/locale/po/messages_ru.po
+trans.sk = installer/resources/locale/po/messages_sk.po
+trans.sv_SE = installer/resources/locale/po/messages_sv.po
+trans.tr_TR = installer/resources/locale/po/messages_tr.po
+;; currently fails check
+;;trans.uk_UA = installer/resources/locale/po/messages_uk.po
+trans.zh_CN = installer/resources/locale/po/messages_zh.po
+
+[I2P.getopt]
+source_file = core/java/src/gnu/getopt/MessagesBundle.properties
+source_lang = en
+type = PROPERTIES
+trans.cs = core/java/src/gnu/getopt/MessagesBundle_cs.properties
+trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
+trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
+trans.fi = core/java/src/gnu/getopt/MessagesBundle_fi.properties
+trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
+trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
+;; Java converts id to in
+trans.id = core/java/src/gnu/getopt/MessagesBundle_in.properties
+trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
+trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
+trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
+trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
+trans.nb = core/java/src/gnu/getopt/MessagesBundle_nb.properties
+trans.pl = core/java/src/gnu/getopt/MessagesBundle_pl.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt = core/java/src/gnu/getopt/MessagesBundle_pt.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
+trans.ro = core/java/src/gnu/getopt/MessagesBundle_ro.properties
+trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
+trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
+;; currently corrupt, non-UTF-8
+;;trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
+trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
+trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
+
+[I2P.streaming]
+source_file = apps/ministreaming/locale/messages_en.po
+source_lang = en
+trans.ca = apps/ministreaming/locale/messages_ca.po
+trans.de = apps/ministreaming/locale/messages_de.po
+trans.es = apps/ministreaming/locale/messages_es.po
+trans.fr = apps/ministreaming/locale/messages_fr.po
+;; Java converts id to in
+trans.id = apps/ministreaming/locale/messages_in.po
+trans.it = apps/ministreaming/locale/messages_it.po
+trans.nb = apps/ministreaming/locale/messages_nb.po
+trans.pl = apps/ministreaming/locale/messages_pl.po
+trans.ro = apps/ministreaming/locale/messages_ro.po
+trans.ru_RU = apps/ministreaming/locale/messages_ru.po
+trans.sv_SE = apps/ministreaming/locale/messages_sv.po
+trans.uk_UA = apps/ministreaming/locale/messages_uk.po
+trans.zh_CN = apps/ministreaming/locale/messages_zh.po

 [main]
-host = http://www.transifex.net
+host = https://www.transifex.com

--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -11,8 +11,8 @@ you may use:
  lynx http://localhost:7657/
 to configure the router.

-If you're having trouble, swing by http://forum.i2p2.de/, check the
-website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p
+If you're having trouble, swing by http://forum.i2p/, check the
+website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p

 I2P will create and store files and configuration data in the user directory
 ~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
@@ -25,21 +25,25 @@ where there are comments labeled "PORTABLE". Do this before you
 run I2P for the first time.

 To start I2P:
-   (*nix): sh i2prouter start
+   (*nix, BSD, Mac): sh i2prouter start
   (win*): I2P.exe
-   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+   (platforms without wrapper support): sh runplain.sh

 To stop I2P (gracefully):
   lynx http://localhost:7657/summaryframe (click "Shutdown")
+   or (*nix, BSD, Mac) sh i2prouter graceful

 To stop I2P immediately:
-   sh i2prouter stop
+   (*nix, BSD, Mac) sh i2prouter stop

 To uninstall I2P:
   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.com/download (1.5+ supported)
-  Linux:   Latest available from http://java.com/download (1.5+ supported)
-  FreeBSD: 1.5-compatible (NIO required)
-  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+  All platforms: Java 1.7 or higher required
+  Windows: OpenJDK or Oracle from http://java.com/download
+  Linux:   OpenJDK or Oracle from http://java.com/download
+  FreeBSD: OpenJDK or Oracle from http://java.com/download
+  Raspberry Pi: Oracle 8 Early Access https://jdk8.java.net/download.html
+  PowerPC: IBM SDK 7 http://www.ibm.com/developerworks/java/jdk/linux/download.html
+  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java or https://geti2p.net/download
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,11 +1,13 @@
 I2P source installation instructions

 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
-	from the GNU gettext package http://www.gnu.org/software/gettext/
+	  from the GNU gettext package http://www.gnu.org/software/gettext/
+	Build environment must use a UTF-8 locale.

 To build and install I2P from source, you must first build
 and package up the appropriate installer by running:
@@ -40,29 +42,30 @@ or on Windows, just double-click on i2pinstall.exe.
 Or move the i2pupdate.zip file into an existing installation directory and restart.

 To start I2P:
-   (*nix): sh i2prouter start
+   (*nix, BSD, Mac): sh i2prouter start
   (win*): I2P.exe or i2prouter.bat
-   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+   (platforms without wrapper support): sh runplain.sh

 To install I2P as a system service:
-   (*nix) sh i2prouter install
+   (*nix, BSD, Mac) sh i2prouter install
   (win*) install_i2p_service_winnt.bat

 To uninstall I2P as a system service:
-   (*nix) sh i2prouter remove
+   (*nix, BSD, Mac) sh i2prouter remove
   (win*) uninstall_i2p-service_winnt.bat

 To stop I2P (gracefully):
   lynx http://localhost:7657/summaryframe (click "Shutdown")
+   or (*nix, BSD, Mac) sh i2prouter graceful

 To stop I2P immediately:
-   sh i2prouter stop
+   (*nix, BSD, Mac) sh i2prouter stop

 To uninstall I2P:
   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.com/download (1.5+ supported)
-  Linux:   Latest available from http://java.com/download (1.5+ supported)
-  FreeBSD: 1.5-compatible (NIO required)
+  Windows: Latest available from http://java.com/download (1.7+ supported)
+  Linux:   Latest available from http://java.com/download (1.7+ supported)
+  FreeBSD: 1.7-compatible (NIO required)
  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -36,7 +36,7 @@ Public domain except as listed below:
   Copyright (c) 2003, TheCrypto
   See licenses/LICENSE-ElGamalDSA.txt

-   SHA256 and HMAC-SHA256:
+   SHA256 and HMAC:
   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
   See licenses/LICENSE-SHA256.txt

@@ -72,6 +72,18 @@ Public domain except as listed below:
   Copyright (c) 2006, Matthew Estes
   See licenses/LICENSE-BlockFile.txt

+   SipHashInline:
+   Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
+   See licenses/LICENSE-Apache2.0.txt
+
+   Getopt:
+   Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com)
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   HostnameVerifier:
+   From Apache HttpClient 4.4.1 and HttpCore 4.4.1
+   See licenses/LICENSE-Apache2.0.txt
+

 Router (router.jar):
 Public domain except as listed below:
@@ -79,11 +91,13 @@ Public domain except as listed below:
   From freenet
   See licenses/LICENSE-GPLv2.txt

-   UPnP subsystem 1.7:
-   Copyright (C) 2003-2006 Satoshi Konno
+   UPnP subsystem (CyberLink) 3.0:
+   Copyright (C) 2003-2010 Satoshi Konno
   See licenses/LICENSE-UPnP.txt

-   GeoIP data free to use, courtesy http://www.maxmind.com/
+   GeoIP: GeoLite databases are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+   http://creativecommons.org/licenses/by-sa/3.0/
+   This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/


 Installer:
@@ -127,7 +141,7 @@ Installer:



-Java Service Wrapper Community Edition 32-bit 3.5.13:
+Java Service Wrapper Community Edition 32-bit 3.5.25:
   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
   See licenses/LICENSE-Wrapper.txt

@@ -172,10 +186,11 @@ Applications:
   By welterde.
   See licenses/LICENSE-GPLv2.txt

-   Jetty 6.1.26:
-   Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-   See licenses/LICENSE-Jetty.txt
+   Jetty 8.1.17.v20150415:
+   See licenses/ABOUT-Jetty.html
+   See licenses/NOTICE-Jetty.html
   See licenses/LICENSE-Apache2.0.txt
+   See licenses/LICENSE-ECLIPSE-1.0.html
   See licenses/NOTICE-Commons-Logging.txt

   JRobin 1.5.9.1:
@@ -195,17 +210,23 @@ Applications:
         - Jersey and EU flag icons: public domain, courtesy Xrmap flag
           collection http://www.arvernes.com/wiki/index.php/Xrmap
         - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
+         - Curaçao, courtesy of David Benbennick, released into the public domain
         - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
       Silk icons: See licenses/LICENSE-SilkIcons.txt
+       FatCow icons: See licenses/LICENSE-FatCowIcons.txt

       GeoIP Data:
-       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
+       This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
       See licenses/LICENSE-GeoIP.txt

   Router Console and I2PSnark themes:
   "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
   Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155

+   I2PSnark light theme:
+   "Creative Commons Cat" licensed under a Creative Commons Attribution 3.0 Unported License.
+   Original photo by Boaz Arad. http://www.luxphile.com/2011/01/creative-commons-cat.html
+
   SAM:
   Public domain.

@@ -231,8 +252,8 @@ Applications:
      Bundles systray4j-2.4.1:
      See licenses/LICENSE-LGPLv2.1.txt

-   Tomcat 6.0.35:
-   Copyright 1999-2011 The Apache Software Foundation
+   Tomcat 6.0.44:
+   Copyright 1999-2015 The Apache Software Foundation
   See licenses/LICENSE-Apache2.0.txt
   See licenses/NOTICE-Tomcat.txt

--- a/README.txt
+++ b/README.txt
@@ -1,9 +1,11 @@
 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	  from the GNU gettext package http://www.gnu.org/software/gettext/
+	Build environment must use a UTF-8 locale.

 To build:
 	On x86 systems do:
@@ -15,24 +17,34 @@ To build:
 		ant installer-osx

 	Run 'ant' with no arguments to see other build options.
-	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
+	See INSTALL.txt or https://geti2p.net/download for installation instructions.

 Documentation:
-	http://www.i2p2.de/how
-	API: run 'ant javadoc' then start at build/javadoc/index.html
+	https://geti2p.net/how
+	API: http://docs.i2p-projekt.de/javadoc/
+	     or run 'ant javadoc' then start at build/javadoc/index.html

 Latest release:
-	http://www.i2p2.de/download.html
+	https://geti2p.net/download

 To get development branch from source control:
-	http://www.i2p2.de/newdevelopers.html
+	https://geti2p.net/newdevelopers

 FAQ:
-	http://www.i2p2.de/faq.html
+	https://geti2p.net/faq

 Need help?
 	IRC irc.freenode.net #i2p
-	http://forum.i2p2.de/
+	http://forum.i2p/
+
+Bug reports:
+	https://trac.i2p2.de/report/1
+
+Contact information, security issues, press inquiries:
+	https://geti2p.net/en/contact
+
+Twitter:
+	@i2p, @geti2p

 Licenses:
 	See LICENSE.txt
--- a/Slackware/README
+++ b/Slackware/README
@@ -1,30 +1,70 @@
-ou will need atleast monotone > = 0.41 to get the most recent build source
-and connect it to an already running i2p router.
+Getting the sources
+===================

-OR:
+Monotone
+--------

-You may download the actual "stable" source from
-http://code.google.com/p/i2p/downloads/list
+The bleeding-edge source code is available both within and outside of I2P. The
+I2P project uses Monotone to maintain the codebase.

-You will need to follwing tools to build the i2p and i2p-base packages:
+Information on retrieving the source with monotone is available within I2P at
+http://i2p-projekt.i2p/monotone and from the internet at https://geti2p.net/monotone.

-bash >= 3.1.017
-requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html )
-jre >= 6u11
-jdk >= 6u11
-apache-ant >= 1.7.1
-perl >= 5.10.0
-python >= 2.5.2
+Monotone 1.0 Slackbuilds are available at http://slackbuilds.org/.

-Reccomended:
-monotone >= 0.41 ( http://pkgs.dr.ea.ms )
+Git
+---

-See also:
+Git is also an option to retrieve the I2P source code. That said, the I2P
+Monotone servers are *the* authoritative source.

-i2p/readme.txt
+Public Git repositories hosting the I2P source and managed by I2P project team members include

-AND
+- https://github.com/i2p/i2p.i2p
+- http://git.repo.i2p/w/i2p.i2p.git (mirrored from Github)
+- http://sourceforge.net/p/i2p/code/

-i2p-base/readme.txt

-for information and handy tips.
+Tarball
+-------
+
+The latest stable release is always available from the I2P homepage at
+https://geti2p.net/get/.
+
+
+This SlackBuild
+===============
+
+Requirements
+-------------
+
+The following are needed to build the i2p package:
+
+* jre >= 6
+* jdk >= 6
+* gettext
+* apache-ant >= 1.7.1
+
+If you don't care about bundling the translations, the gettext requirement can
+be avoided by adding -Drequire.gettext=false to the ant lines in
+i2p/i2p.SlackBuild
+
+A JRE >= v6 is the only requirement to run I2P.
+
+Building
+--------
+
+As the root user, run either $I2PSRC/Slackware/i2p/i2p.SlackBuild or `ant slackpkg` to create a package
+in $I2PSRC/Slackware/i2p which can be installed using the Slackware packaging tools.
+
+See also
+========
+
+Please also take a look at
+
+* i2p/README
+* eepget(1)
+* i2prouter(1)
+* http://i2p-projekt.i2p / https://geti2p.net
+
+for additional information and tips.
--- a/Slackware/i2p-base/build.xml
+++ b/Slackware/i2p-base/build.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project basedir="." default="slackpkg">
-    <target name="slackpkg">
-        <echo message="Building Slackware package." />
-        <exec executable="./i2p-base.SlackBuild">
-        </exec>
-    </target>
-</project>
--- a/Slackware/i2p-base/doinst.sh
+++ b/Slackware/i2p-base/doinst.sh
@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-#
-# Now in the future we only need to look for '#I2P' and '#/I2P' 
-# for modifications to rc.local and rc.local_shutdown. 
-# I was a moron for not doing it this way in the first place :-) -- Sponge
-#
-#
-
-touch /etc/rc.d/rc.local
-touch /etc/rc.d/rc.local_shutdown
-
-echo
-echo -n "Check 1: /etc/rc.d/rc.local "
-I2PRCA=`grep -c /etc/rc.d/rc.local -e '/etc/rc.d/rc.i2p'`
-
-if [ $I2PRCA -eq 0 ] ; then
-	echo '#I2P' >> /etc/rc.d/rc.local
-	echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-	echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-	echo "fi" >> /etc/rc.d/rc.local
-	echo '#/I2P' >> /etc/rc.d/rc.local
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs, or where people have modified.
-
-	echo -n " Check 1A: "
-	I2PRCC=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-
-	if [ $I2PRCC -eq 0 ] ; then
-		DATA=$(cat /etc/rc.d/rc.local | sed -re 's/if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/#I2P\n\( cd \/tmp ; rm -Rf i2p-*.tmp \)\nif \[ -x \/etc\/rc.d\/rc.i2p \] ; then/')
-		echo "${DATA}" > /etc/rc.d/rc.local
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-
-	echo -n " Check 1B: "
-	I2PRCE=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-	if [ $I2PRCE -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/i2p-\*\.tmp/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/i2p-\*\.tmp/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-		
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo -n " Check 1C: "
-	I2PRCF=`grep -c /etc/rc.d/rc.local -e '#/I2P'`
-	if [ $I2PRCF -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo " Done."
-fi
-
-echo -n "Check 2: /etc/rc.d/rc.local_shutdown "
-I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e '/etc/rc.d/rc.i2p'`
-if [ $I2PRCB -eq 0 ] ; then
-	echo "#I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-	echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-	echo "fi" >> /etc/rc.d/rc.local_shutdown
-	echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs
-
-	echo -n " Check 1A: "
-	I2PRCG=`grep -c /etc/rc.d/rc.local_shutdown -e '#I2P'`
-	if [ $I2PRCG -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo -n " Check 1B: "
-	I2PRCH=`grep -c /etc/rc.d/rc.local_shutdown -e '#/I2P'`
-	if [ $I2PRCH -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo " Done."
-fi
-
-if [ -f /etc/rc.d/rc.i2p ] ; then
-	if [ -x /etc/rc.d/rc.i2p ] ; then
-		chmod +x /etc/rc.d/rc.i2p.new
-	fi
-	# Hopefully get admin's attention.
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-	echo "It apears that you already have /etc/rc.d/rc.i2p"
-	echo "You should replace it with /etc/rc.d/rc.i2p.new as soon as possible"
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-else
-	mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
-	echo
-	echo "Installation finished. The i2p start/stop script has been"
-	echo "installed in /etc/rc.d . You should chmod +x"
-	echo '/etc/rc.d/rc.i2p to start it on boot.'
-	echo
-fi
-
-exit
--- a/Slackware/i2p-base/i2p-base.SlackBuild
+++ b/Slackware/i2p-base/i2p-base.SlackBuild
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Heavily based on the Slackware 12.2 SlackBuild
-# Slackware build script for I2P
-#
-# PLEASE READ THIS:
-# How to start I2P:
-# After installpkg command, doinst.sh will execute a post-installation script
-# needed by I2P. After that you have to chmod +x /etc/rc.d/rc.i2p and start
-# I2P service with /etc/rc.d/rc.i2p start.
-#
-# Now tell your browser to user this proxy: localhost on port 4444 and open
-# this page: http://localhost:7657/index.jsp
-#
-# Here you can configure I2P, watch network status and navigate anonimously.
-# It's suggested to subscribe to various dns host, like i2host.i2p
-# For any additional information, visit i2host.i2p and forum.i2p
-#
-
-CWD=$(pwd)
-TMP=/tmp
-PKG=/$TMP/package-base-i2p
-NAME=i2p-base
-VERSION=0.0.4
-BUILD=1sponge
-ARCH=noarch
-INSTALL_DIR=opt
-
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-rm -rf $PKG
-mkdir -p $PKG
-cd $PKG
-chown -R root:root .
-
-mkdir -p $PKG/etc/rc.d
-mkdir -p $PKG/install
-sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" "$CWD/rc.i2p_def" > $PKG/etc/rc.d/rc.i2p.new
-chmod 644 $PKG/etc/rc.d/rc.i2p.new
-cat "$CWD/doinst.sh" > $PKG/install/doinst.sh
-cat "$CWD/slack-desc" > $PKG/install/slack-desc
-
-cd $PKG
-#
-# Not really that important to exec this 
-# as there aren't any deps we don't know.
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat "$CWD/slack-required" > $PKG/install/slack-required
-makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT
--- a/Slackware/i2p-base/rc.i2p_def
+++ b/Slackware/i2p-base/rc.i2p_def
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop i2p service.
-
-i2p_start() {
- # Check if router is up first!
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" > /dev/null
- if [ $? -eq 0 ] ; then {
-  # I2p is already running, so tell the user.
-  echo "I2P is already running..."
-  i2p_status
- } 
- else
- {
-  # Just in-case there are leftover junk in /tmp...
-  rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-  # Now that all junk is cleaned up, start.
-  /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory start )'"
- }
- fi
-}
-
-i2p_stop() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory stop )'"
- rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-}
-
-i2p_restart() {
- # We want a FULL cycle here, not the wrappers idea of this!
- i2p_stop
- i2p_start
-}
-
-i2p_status() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'"
-}
-
-i2p_console() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'"
-}
-
-i2p_dump() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory dump )'"
-}
-
-case "$1" in
-'start')
-  i2p_start
-  ;;
-'stop')
-  i2p_stop
-  ;;
-'restart')
-  i2p_restart
-  ;;
-'status')
-  i2p_status
-  ;;
-'console')
-  i2p_console
-  ;;
-'dump')
-  i2p_dump
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status|console|dump"
-  ;;
-esac
-
--- a/Slackware/i2p-base/readme.txt
+++ b/Slackware/i2p-base/readme.txt
@@ -1,10 +0,0 @@
-An rc file called rc.i2p has been placed into the /etc/rc.d directory.
-If you want to change installation dir, change the variable INSTALL_DIR
-on base-i2p.SlackBuild and rebuild the package. You also will need to do the
-same for the i2p package.
-
-The install script will insert everything needed into /etc/rc.d/rc.local and
-into /etc/rc.d/rc.local_shutdown automatically.
-
-If you want to start I2P at boot you have to chmod +x /etc/rc.d/rc.i2p
-
--- a/Slackware/i2p-base/slack-desc
+++ b/Slackware/i2p-base/slack-desc
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-base-i2p: base-i2p (I2P anonymizing network base config files)
-base-i2p:
-base-i2p: I2P is an anonymizing network, offering a simple layer that
-base-i2p: identity-sensitive applications can use to securely communicate. All
-base-i2p: data is wrapped with several layers of encryption, and the network is
-base-i2p: both distributed and dynamic, with no trusted parties.
-base-i2p: Many applications are available that interface with I2P, including 
-base-i2p: mail, peer-peer file sharing, IRC chat, and others.
-base-i2p:
-base-i2p: This package provides the startup files.
-base-i2p:
--- a/Slackware/i2p-base/slack-required
+++ b/Slackware/i2p-base/slack-required
@@ -1 +0,0 @@
-bash >= 3.1.017
--- a/Slackware/i2p/README
+++ b/Slackware/i2p/README
@@ -0,0 +1,89 @@
+The I2P package will be installed to /opt/i2p.
+
+To install to another location, set the variable INSTALL_DIR in i2p.SlackBuild
+and rebuild the package.
+
+
+Installing and Upgrading:
+=========================
+
+I2P has an auto-update function but generally speaking packages are managed by
+packaging systems. Changing a package's files outside of the package system can
+cause problems. To upgrade when there's a new I2P release, retrieve the new
+source, re-run the SlackBuild, then use upgradepkg to update.
+
+To ignore all this and upgrade "in-network", simply change the permissions of the installation
+directory (/opt/i2p by default). Something like the following would suffice:
+
+    chown -R USERNAME /opt/i2p
+
+
+Starting and using I2P
+======================
+
+Using the initscript
+--------------------
+
+To start I2P at boot, set the executable bit on /etc/rc.d/rc.i2p, add this
+script to rc.local*, and set the variable "RUN_AS_USER" in /etc/rc.d/rc.i2p.
+
+Optionally, create a new user/group with limited rights to run I2P.
+
+Something like the following would work to start I2P at system boot, running under the
+"i2p" account:
+
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p start' >> /etc/rc.d/rc.local
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p stop' >> /etc/.rc.d/rc.local_shutdown
+     sed -i .bak 's/^.*\(RUN_AS_USER\)=.*/\1=i2p/' /etc/rc.d/rc.i2p
+     chmod 755 /etc/rc.d/rc.i2p
+
+Unless running as a user named "i2psvc", I2P's config directory defaults to
+$HOME/.i2p. In the case of the "i2psvc" user, the default config directory is
+/var/lib/i2p/i2p-config.
+
+It should not need to be said that using the "root" account is not recommended.
+
+When running using the initscript, I2P will write its logs to /var/log/i2p.
+
+Starting I2P "on-demand"
+------------------------
+
+As with a normal installation, I2P can be started with "i2prouter start". The
+i2prouter and eepget scripts hve been installed to /usr/bin so they'll be
+accessible in the default system PATH.
+
+When running using the i2prouter script, I2P will write its logs to $HOME/.i2p.
+
+
+Configuring your browser
+------------------------
+
+In order to access eepSites (I2P-internal web sites) your web browser needs to
+be configured. Set the HTTP Proxy to 127.0.0.1 and port 4444. For more information, see
+https://geti2p.net/en/about/browser-config
+
+The I2P router console is reachable at http://127.0.0.1:7657.
+
+
+Addressbook subscriptions
+-------------------------
+
+Please see the FAQs at http://i2p-projekt.i2p/faq or https://geti2p.net/faq for information about
+the various addressbook services.
+
+
+Chatting on IRC
+---------------
+
+I2P comes preconfigured with a tunnel pointing to the I2P-only IRC network,
+Irc2P.  Signing on is easy, just connect to 127.0.0.1 on port 6668. Do not
+configure a proxy in your IRC client.
+
+
+Additional information
+======================
+
+Within I2P: http://i2p-projekt.i2p/, http://forum.i2p/, http://zzz.i2p/, http://trac.i2p2.i2p/
+On the Internet:  https://geti2p.net/, https://trac.i2p2.de
+Manpages: i2prouter(1), eepget(1)
+
--- a/Slackware/i2p/build.xml
+++ b/Slackware/i2p/build.xml
@@ -2,7 +2,7 @@
 <project basedir="." default="slackpkg">
    <target name="slackpkg">
        <echo message="Building Slackware package." />
-        <exec executable="./i2p.SlackBuild">
-        </exec>
+        <chmod file="./i2p.Slackbuild" perm="755" />
+        <exec executable="./i2p.SlackBuild" failifexecutionfails="true" />
    </target>
 </project>
--- a/Slackware/i2p/doinst.sh
+++ b/Slackware/i2p/doinst.sh
@@ -1,72 +1,60 @@
 #!/bin/sh

+# Abort on error or unset variables
+set -e
+set -u
+
+# This is changed by i2p.SlackBuild
 INST_DIR=directory
+PKGNAME="%pkg"

-( cd install
+config() {
+    NEW="$1"
+    OLD="$(dirname $NEW)/$(basename $NEW .new)"
+    if [ ! -r $NEW ]; then
+        # If we get here there's a flaw in the packaging. We'll just return so that
+        # we don't emit a spurious error for the user. (It's not the user's problem).
+        return
+    fi

-echo
-for i in *.config ; {
-	if [ -f $INST_DIR/$i ] ; then
-		echo "Please check ${INST_DIR}${i}, as there is a new version."
-		cp $i $INST_DIR/$i.new
-	else
-		cp $i $INST_DIR/$i
-	fi
+    # If this file doesn't exist yet, drop the .new extension.
+    if [ ! -r $OLD ]; then
+        mv $NEW $OLD
+        return
+    elif [ "$(md5sum $OLD | cut -d' ' -f1)" = "$(md5sum $NEW | cut -d' ' -f1)" ]; then
+        # If there are no differences in the files, remove the file with the .new extension.
+        rm $NEW
+        return
+    fi
+    # Alert the admin if they differ, but let's not be terribly obnoxious about it.
+    echo "WARNING: The files $OLD and $NEW differ." >&2
 }

-)
+# Unlike previous versions of the package, we install i2prouter and eepget to /usr/bin
+# to make them available within the system PATH.

-( cd $INST_DIR
-	if [ -f blocklist.txt ] ; then
-		echo "Please check ${INST_DIR}blocklist.txt, as there is a new version."
-	else
-		mv blocklist.txt.new blocklist.txt
-	fi
-)
+# Users might still want to /opt/i2p/i2prouter or /opt/i2p/eepget so we'll create symlinks
+# in the installation directory.
+ln -sf /usr/bin/eepget $INST_DIR
+ln -sf /usr/bin/i2prouter $INST_DIR
+(cd /usr/doc/$PKGNAME; ln -sf $INST_DIR/history.txt changelog)

-( cd $INST_DIR/eepsite
-	if [ -f jetty.xml ] ; then
-		echo "Please check ${INST_DIR}/eepsite, as there are new files."
-	else
-		find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \;
-	fi
-)
-
-( cd $INST_DIR/eepsite/docroot
-	if [ -f index.html ] ; then
-		rm index.html.new
-	else
-		mv index.html.new index.html
-	fi
-	if [ -f favicon.ico ] ; then
-		rm favicon.ico.new
-	else
-		mv favicon.ico.new favicon.ico
-	fi
-)
-
-echo
-echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
-
-cd $INST_DIR
-
-
-
-OS_ARCH=`uname -m`
-X86_64=`echo "$OS_ARCH" | grep x86_64`
-if [ "X$X86_64" = "X" ]; then
-        wrapperpath="./lib/wrapper/linux"
+if $(uname -m | grep -q '64'); then
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-64 i2psvc)
 else
-        wrapperpath="./lib/wrapper/linux64"
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-32 i2psvc)
 fi
-cp $wrapperpath/libwrapper.so ./lib/
-cp $wrapperpath/wrapper.jar ./lib/
-cp $wrapperpath/i2psvc .
-rm -rf ./lib/wrapper
-chmod 744 ./i2psvc

-echo
-echo "Installation finished."
-echo
+config /etc/rc.d/rc.i2p.new
+config $INST_DIR/wrapper.config.new

-exit
+if [ -e /var/log/packages/i2p-base* ]; then
+    echo "Warning: This package supercedes the 'i2p-base' package." >&2
+    echo
+    echo "You may want to 'removepkg i2p-base'" >&2
+    echo "and check the contents of /etc/rc.d/rc.local*" >&2
+    echo "for correctness" >&2
+fi
+
+# Remove extraneous 'sh' from sponge's set-up
+sed -i 's|sh /etc/rc\.d/rc\.i2p|/etc/rc.d/rc.i2p|g' /etc/rc.d/rc.local*
--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -3,135 +3,124 @@
 # Heavily based on the Slackware 12.2 SlackBuild
 # Slackware build script for I2P
 #
-# PLEASE READ THIS:
-# Probably you will never have to update I2P packages with upgradepkg,
-# just because I2P has an auto-update function.
-# Really you should not ever use any "upgrade" method.
-#
-# The correct way to upgrade is to: 
-# 1: install the upgrade
-# 2: remove the old package
-#
-# It is a terrible shame that upgradepkg doesn't do this, infact, 
-# it would actually be the correct way for *any* package!
+# Packages are generally prohibited from being updated outside
+# of the package manager; this I2P SlackBuild is no different.
 #
+# If you'd like to use the I2P "in-network" updates anyway, you'll need to
+# grant the user that I2P will run as write permission to the installation directory
+# (/opt/i2p by default).
 #
+# For safety's sake, a user's I2P config files will *never* be overwritten by any upgrade method.
+# In the future this SlackBuild may alert when a default config file is updated.
+##

-BUILD=1sponge
+# Make sure makepkg and friends can be found
+PATH=$PATH:/sbin
+
+# abort on error and unset variables (same as set -e and set -u, respectively)
+set -o errexit
+set -o nounset
+
+if [ $(id -ur) -ne 0 ]; then
+    echo "ERROR: SlackBuilds require root access." >&2
+    exit 1
+fi
+
+BUILD=1kytv
 # INSTALL_DIR is referenced from /, don't prefix it with a '/'
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch

-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-
-#
-# This mess is here due to the totally moronic way i2p does versioning.
-# We correct it here.
-#
-ROUTER=$(echo -ne "_")$(cat ../../router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
-if [ "$ROUTER" == "_" ] ;  then
-	ROUTER="_0"
-fi
-
-#
-# That was the easy one, now for the tough one.
-#
-
-CORE=$(cat ../../core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
-CORE1=$(echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-CORE2=$(echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-
-if [ "$CORE.x.x" == "$CORE1" ] ; then
-	CORE=$(echo -ne $CORE".0.0")
-fi
-if [ "$CORE.x" == "$CORE2" ] ; then
-	CORE=$(echo -ne $CORE".0")
-fi
-
-VERSION=$(echo $CORE$ROUTER)
-#
-# Whew!
-# OK, let's build i2p
-#
-
-CWD=$(pwd)
+CWD=$(readlink -m $(dirname $0))
+I2PSRC=$(readlink -m $CWD/../../)
 TMP=/tmp
-
 PKG=$TMP/package-i2p
-rm -rf $PKG
-mkdir -p $PKG

-cd $CWD/../../
+if [ -e "/etc/slackware-version" ]; then
+    # Older than Slackware 13?
+    SLACKVER=$(sed -e "s/Slackware\s\+\([0-9]\+\)\.\?\([0-9]\+\)\?/\1/" /etc/slackware-version)
+    if [ $SLACKVER -lt 13 ] ; then
+        EXT=tgz
+    else
+        EXT=txz
+    fi
+else
+    echo "ERROR: This script is only intended for use on Slackware systems.">&2
+    exit 1
+fi

+# Extract version strings
+I2PBUILD=$(sed -e '/^.\+long\s\+BUILD/!d' -e 's/^.\+long\s\+BUILD\s\+=\s\+\([0-9]\+\);/\1/' $I2PSRC/router/java/src/net/i2p/router/RouterVersion.java)
+# Thanks to user "ihavei2p" for the second awk statement
+# If the version is x.y, it'll be set to x.y.0. Otherwise the version string will be unchanged
+CORE=$(awk -F'"' '/static\s+String\s+VERSION/{print $2}' $I2PSRC/core/java/src/net/i2p/CoreVersion.java | \
+        awk -F. '{ if (NF > 3) { print; exit } else if ($3 == "") { $3=0; print $1"."$2"."$3 } else print }')
+VERSION="${CORE}_${I2PBUILD}"
+
+[ -d $PKG ] && rm -rf $PKG
+mkdir -p $PKG/$INSTALL_DIR $PKG/install
+
+cd "$I2PSRC"
 ant distclean
-#ant dist
-ant tarball
+ant jbigi-linux-x86-only preppkg-unix

-tar xjvf i2p.tar.bz2 -C $TMP
+chown -R root:root $I2PSRC/pkg-temp
+cp -a $I2PSRC/pkg-temp $PKG/$INSTALL_DIR/i2p

-cd $TMP/i2p
-chown -R root:root .
-
-mkdir -p $PKG/$INSTALL_DIR/
-cp -a ../i2p $PKG/$INSTALL_DIR/
-
-mkdir -p $PKG/install
-
-#############################################################################
-# Preconfigureation to make package smaller, and...
-# we keep as much as reasonable in the installation directory.
-# This makes the install map fairly well to the standard installation.
-# It also makes it easier to find the log and pid files!
-#############################################################################
+# $INSTALL_DIR is used by this SlackBuild.
+# [%$]INSTALL_PATH , [%$]SYSTEM_java_io_tmpdir, and [%$]USER_HOME have the correct paths set
+# by the IzPack installer.
 cd $PKG/$INSTALL_DIR/i2p
+for file in wrapper.config eepget i2prouter runplain.sh; do
+    sed -i "s|[%$]INSTALL_PATH|/$INSTALL_DIR/i2p|g;s|[$%]SYSTEM_java_io_tmpdir|$TMP|g;s/[%$]USER_HOME/\$HOME/g" $file
+done
+mv wrapper.config wrapper.config.new

-# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a
-sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config
-# eepget %INSTALL_PATH
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a
-rm eepget
-mv a eepget
-# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
-# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
-rm i2prouter
-mv a i2prouter
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a
-sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter
+install -d $PKG/usr/bin
+install -d $PKG/usr/doc/$NAME-$VERSION
+install -d $PKG/etc/rc.d
+mv licenses LICENSE.txt -t $PKG/usr/doc/$NAME-$VERSION

-chmod 744 ./i2prouter
-chmod 744 ./osid
-chmod 744 ./runplain.sh
-chmod 744 ./eepget
-chmod 744 ./scripts/i2pbench.sh
-chmod 744 ./scripts/i2ptest.sh
-rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh
+# runplain.sh will live in the installation directory. eepget and i2prouter will go to /usr/bin
+# with symlinks in INST_DIR (created in doinst.sh)
+install -m755 i2prouter $PKG/usr/bin
+install -m755 eepget $PKG/usr/bin
+chmod 755  ./runplain.sh

-mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
-mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
-find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \;
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
-sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
+if [ $INSTALL_DIR != 'opt' ]; then
+    sed "s|\(The I2P package\)\s\+will be\s\+\(installed to\).+|\1 has been \2 $INSTALL_DIR/i2p|g" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+else
+    sed "s|will be installed|has been installed|" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+fi
+
+install -d $PKG/usr/man/man1
+gzip -9 man/*.1
+install -m644 man/*.1.gz $PKG/usr/man/man1
+rm -rf ./man
+
+# We install all x86 wrapper binaries.
+# The i2prouter script will try to determine the OS (linux), the bits (32 VS 64) and should be able
+# to figure out the correct wrapper binary to use.
+
+# However: In case the i2prouter script's detection fails, "$INST_DIR/i2psvc" will point to
+# what 'we' think the correct binary is.
+#
+# A good reason for installing all binaries: in case the user, for whatever reason, switches from an
+# x64 JRE to an x86 JRE, I2P should continue to work without needing to be reinstalled.
+install -m755 $I2PSRC/installer/lib/wrapper/linux/i2psvc ./i2psvc-linux-x86-32
+install -m644 $I2PSRC/installer/lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
+install -m755 $I2PSRC/installer/lib/wrapper/linux64/i2psvc ./i2psvc-linux-x86-64
+install -m644 $I2PSRC/installer/lib/wrapper/linux64/libwrapper.so ./lib/libwrapper-linux-x86-64.so
+install -m644 $I2PSRC/installer/lib/wrapper/all/wrapper.jar ./lib/wrapper.jar
+install -m644 $I2PSRC/build/jbigi.jar $PKG/$INSTALL_DIR/i2p/lib/jbigi.jar
+
+rm -f ./postinstall.sh ./osid ./INSTALL-*.txt
+sed "s|directory|/$INSTALL_DIR/i2p|" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -i "s|%pkg|$NAME-$VERSION|" $PKG/install/doinst.sh
+sed "s|%INST_DIR|/$INSTALL_DIR/i2p|" $CWD/rc.i2p> $PKG/etc/rc.d/rc.i2p.new
+cp $CWD/slack-desc $PKG/install/slack-desc

 cd $PKG
-#
-# requiredbuilder fucks up REALLY bad, and thinks java is perl?!
-# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat $CWD/slack-required > $PKG/install/slack-required
+cp $CWD/slack-required $PKG/install/slack-required
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT
--- a/Slackware/i2p/rc.i2p
+++ b/Slackware/i2p/rc.i2p
@@ -0,0 +1,185 @@
+#!/bin/sh
+
+# Abort on errors
+set -e
+
+##
+# This *must* be configured. Set this to the user that will run I2P.
+# Note: If you don't want I2P to start automatically at boot,
+# use "i2prouter start" as a non-root user to start I2P.
+#RUN_AS_USER=
+##
+
+##
+# Set the locale as desired.
+# Note: this is not the same as the language shown in the I2P router console.
+# This affects the locale used in wrapper.log. For best results, use a
+# unicode enabled locale. This is especially important for foreign language torrents.
+#
+# If not set the user's configured locale will be used.
+#RCLOCALE=
+##
+
+#####################################################
+# Nothing below this point should need to be edited #
+#####################################################
+# %INST_DIR is set by i2p.SlackBuild
+INSTALL_DIR="%INST_DIR"
+# Make sure the package is installed and that the wrapper can be found
+[ -d $INSTALL_DIR ] && [ -x $INSTALL_DIR/i2psvc ] || (echo "The I2P package is not installed" >&2 ; exit 1)
+
+if [ -z $RUN_AS_USER ]; then
+    echo "ERROR: RUN_AS_USER not configured in $0" >&2
+    exit 1
+fi
+
+if [ $(id -ur) -ne 0 ]; then
+    echo 'ERROR: You must be root to start this service.' >&2
+    echo
+    exit 1
+fi
+
+if [ -z $RCLOCALE ]; then
+    if [ ! $(locale -a |grep -q "en_US\.utf8") ]; then
+        RCLOCALE="en_US.utf8"
+    fi
+fi
+
+# Abort this script if any referenced variables haven't been set
+set -u
+
+if $(uname -m |grep -q '64'); then
+    BITS='64'
+else
+    BITS=''
+fi
+
+PATH="$PATH:/usr/lib$BITS/java/bin:/usr/lib$BITS/java/jre/bin"
+RUN=/var/run/i2p
+PIDFILE="$RUN/i2p.pid"
+WRAPPER_CONF="$INSTALL_DIR/wrapper.config"
+WRAPPERLOG=/var/log/i2p/wrapper.log
+I2PTEMP="/tmp/i2p-daemon"
+DESC="The I2P daemon"
+JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
+
+if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+    for rc in /etc/profile.d/*jdk*.sh /etc/profile.d/*java*.sh; do
+        [ -r $rc ] && . $rc
+    done
+    if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+        echo "ERROR: Cannot find java. Please set the path to java in $WRAPPER_CONF" >&2
+        exit 1
+    fi
+fi
+
+JAVA=$(which $JAVABINARY 2>/dev/null)
+
+I2P_ARGS="$WRAPPER_CONF \
+ wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
+ wrapper.java.additional.10=-Dwrapper.logfile=$WRAPPERLOG \
+ wrapper.java.additional.11=-Di2p.dir.pid=$RUN \
+ wrapper.java.additional.12=-Di2p.dir.temp=$I2PTEMP \
+ wrapper.java.command=$JAVA \
+ wrapper.logfile=$WRAPPERLOG \
+ wrapper.pidfile=$PIDFILE \
+ wrapper.daemonize=TRUE"
+
+LC_ALL=$RCLOCALE
+LANG=$RCLOCALE
+export LC_ALL LANG
+
+is_running() {
+    if [ -r $PIDFILE ]; then
+        PID="$(cat ${PIDFILE})" 2>/dev/null 2>&1
+        if ! kill -0 $PID >/dev/null 2>&1; then
+            rm "$PIDFILE"
+            return 1
+        else
+            return 0
+        fi
+    else
+        return 1
+    fi
+}
+
+start() {
+    if is_running; then
+        echo "ERROR: $DESC is already running." >&2
+    fi
+
+    for DIR in $RUN $I2PTEMP; do
+        test -d $DIR && rm -rf $DIR
+        mkdir -p $DIR
+        chown -R $RUN_AS_USER $DIR
+    done
+    [ -d /var/log/i2p ] || mkdir /var/log/i2p
+    chown -R $RUN_AS_USER /var/log/i2p
+
+    echo -n "Starting $DESC..."
+    TZ=UTC su $RUN_AS_USER -c "$INSTALL_DIR/i2psvc $I2P_ARGS"
+    is_running
+    echo "[pid: $PID]"
+}
+
+stop(){
+    if is_running; then
+        echo -n "Stopping $DESC [pid: $PID] (this could take a while)."
+        kill "$PID" >/dev/null 2>&1
+        while kill -0 "$PID" > /dev/null 2>&1; do
+            echo -n .
+            sleep 1
+        done
+        rm -rf "$RUN" "$I2PTEMP"
+        echo done.
+        return 0
+    else
+        echo "$DESC is not running." >&2
+        return 1
+    fi
+}
+
+
+# Unset +u to allow the 'usage' text to be displayed
+set +u
+case "$1" in
+    start)
+        start
+        ;;
+    status)
+        if is_running; then
+            echo "$DESC is running [pid: $PID]" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    stop)
+        stop
+        ;;
+    graceful)
+        if is_running; then
+            kill -HUP $PID
+            echo "Graceful shutdown of $DESC initiated." >&2
+            echo "This may take up to 11 minutes." >&2
+        fi
+        ;;
+    dump)
+        if is_running; then
+            kill -3 $PID
+            echo "Threads dumped to $WRAPPERLOG" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    restart)
+        if is_running; then
+            stop
+            start
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    *)
+        echo "usage: $0 start|stop|status|restart|graceful|dump"
+        ;;
+esac
--- a/Slackware/i2p/readme.txt
+++ b/Slackware/i2p/readme.txt
@@ -1,47 +0,0 @@
-Building:
-The i2p package will be installed in /opt/i2p 
-
-If you want to change installation dir, change the variable INSTALL_DIR
-on i2p.SlackBuild and rebuild the package. You will also need to do the same
-in the base-i2p package.
-
-Installation and Upgrade:
-Probably you will never have to update i2p packages. However if you do,
-be sure to installpkg first, then removepkg or custom config files can
-be lost with upgradepkg. I2P has an auto-update function. However using
-installpkg then removepkg lowers the demand on the I2P network as a 
-whole, and is by far faster.
-
-After installpkg command, doinst.sh will execute a postinstallation script
-needed by I2P.  Be sure to also install the base-i2p package.
-
-Optional:
-
-chmod +x /etc/rc.d/rc.i2p only if you want it to start on boot and stop on
-shutdown.
-
-How to start I2P:
-
-Start I2P service with-
-sh /etc/rc.d/rc.i2p start
-
-Now tell your browser to user this proxy: localhost on port 4444 and open
-this page: http://localhost:7657/index.jsp
-Here you can configure I2P, watch network status and navigate anonimously.
-It's suggested to subscribe to various addressbook hosts so that you can
-get to the many available eepsites and other service on I2P. These are not
-set up by default for security reasons. 
-
-Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how
-to subscribe to the various addressbook services.
-
-To stop I2P:
- /etc/rc.d/rc.i2p stop
-
-
-For any additional information:
-
-Within I2P- http://www.i2p2.i2p/, http://forum.i2p/, http://zzz.i2p
-
-Internet (not reccomended!) - http://www.i2p2.de/, http://forum.i2p2.de/
-
--- a/Slackware/i2p/slack-desc
+++ b/Slackware/i2p/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.

   |-----handy-ruler----------------------------------------------------------|
-i2p: i2p (an anonymizing network)
+i2p: I2P (an anonymizing network)
 i2p:
 i2p: I2P is an anonymizing network, offering a simple layer that
 i2p: identity-sensitive applications can use to securely communicate. All
@@ -14,6 +14,6 @@ i2p: data is wrapped with several layers of encryption, and the network is
 i2p: both distributed and dynamic, with no trusted parties.
 i2p: Many applications are available that interface with I2P, including 
 i2p: mail, peer-peer file sharing, IRC chat, and others.
-i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg.
-i2p: For more information, see:  http://www.i2p2.de/
+i2p: 
+i2p: For more information, see:  https://geti2p.net/
 i2p:
--- a/Slackware/i2p/slack-required
+++ b/Slackware/i2p/slack-required
@@ -1,4 +1 @@
-jre >= 5
-i2p-base >= 0.0.1
-bash >= 3.1.017
-
+jre >= 6
--- a/apps/BOB/.classpath
+++ b/apps/BOB/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/apps/BOB/.project
+++ b/apps/BOB/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BOB</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- 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;
@@ -74,7 +66,7 @@ public class Main {
 	}

 	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
+		CMDout.write(DataHelper.getUTF8(s));
 		CMDout.write('\n');
 		CMDout.flush();
 	}
--- 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;
@@ -71,7 +63,7 @@ public class Main {
 	}

 	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
+		CMDout.write(DataHelper.getUTF8(s));
 		CMDout.write('\n');
 		CMDout.flush();
 	}
--- a/apps/BOB/build.xml
+++ b/apps/BOB/build.xml
@@ -83,7 +83,7 @@
 	        <pathelement path="${javac.classpath}" />
 	    </path>
 	</copy>
-	<copy todir="${dist.dir}/lib" file="../../installer/lib/jbigi/jbigi.jar" />
+	<copy todir="${dist.dir}/lib" file="../../build/jbigi.jar" />

 	<!-- Extract the classes inside the jar files -->
 	<unjar dest="${dist.dir}/classes" >
--- a/apps/BOB/nbproject/project.properties
+++ b/apps/BOB/nbproject/project.properties
@@ -30,11 +30,11 @@ excludes=**/*.html,**/*.txt
 file.reference.build-javadoc=../../i2p.i2p/build/javadoc
 file.reference.i2p.jar=../../core/java/build/i2p.jar
 file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
-file.reference.jbigi.jar=../../installer/lib/jbigi/jbigi.jar
+file.reference.jbigi.jar=../../build/jbigi.jar
 file.reference.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
 file.reference.router.jar=../../router/java/build/router.jar
 file.reference.streaming.jar=../streaming/java/build/streaming.jar
-file.reference.wrapper.jar=../../installer/lib/wrapper/linux/wrapper.jar
+file.reference.wrapper.jar=../../installer/lib/wrapper/all/wrapper.jar
 includes=**
 jar.compress=true
 javac.classpath=\
--- 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,10 +11,12 @@
 *	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;

+import static net.i2p.app.ClientAppState.*;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,13 +27,17 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;

 import net.i2p.I2PAppContext;
+import net.i2p.app.*;
 import net.i2p.client.I2PClient;
-import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.SimpleTimer2;

 /**
@@ -113,58 +111,78 @@ import net.i2p.util.SimpleTimer2;
 *
 * @author sponge
 */
-public class BOB {
+public class BOB implements Runnable, ClientApp {

-	private final static Log _log = new Log(BOB.class);
 	public final static String PROP_CONFIG_LOCATION = "BOB.config";
 	public final static String PROP_BOB_PORT = "BOB.port";
 	public final static String PROP_BOB_HOST = "BOB.host";
 	public final static String PROP_CFG_VER = "BOB.CFG.VER";
-	private static NamedDB database;
-	private static Properties props = new Properties();
-	private static AtomicBoolean spin = new AtomicBoolean(true);
+
+	/** unused when started via the ClientApp interface */
+	private static BOB _bob;
+
+	private final NamedDB database;
+	private final Properties props = new Properties();
+	private final AtomicBoolean spin = new AtomicBoolean(true);
 	private static final String P_RUNNING = "RUNNING";
 	private static final String P_STARTING = "STARTING";
 	private static final String P_STOPPING = "STOPPING";
-	private static AtomicBoolean lock = new AtomicBoolean(false);
+	private final AtomicBoolean lock = new AtomicBoolean(false);
 	// no longer used.
 	// private static int maxConnections = 0;

-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void info(String arg) {
-		System.out.println("INFO:" + arg);
-		_log.info(arg);
-	}
+	private final Logger _log;
+	private final ClientAppManager _mgr;
+	private final String[] _args;
+	private volatile ClientAppState _state = UNINITIALIZED;

-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void warn(String arg) {
-		System.out.println("WARNING:" + arg);
-		_log.warn(arg);
-	}
-
-	/**
-	 * Log an error
-	 *
-	 * @param arg
-	 */
-	public static void error(String arg) {
-		System.out.println("ERROR: " + arg);
-		_log.error(arg);
-	}
+	private volatile ServerSocket listener;
+	private volatile Thread _runner;

 	/**
 	 * Stop BOB gracefully
+	 * @deprecated unused
 	 */
-	public static void stop() {
-		spin.set(false);
+	public synchronized static void stop() {
+		if (_bob != null)
+			_bob.shutdown(null);
+	}
+
+	/**
+	 *  For ClientApp interface.
+	 *  Does NOT open the listener socket or start threads; caller must call startup()
+	 *
+	 *  @param mgr may be null
+	 *  @param args non-null
+	 *  @throws Exception on bad args
+	 *  @since 0.9.10
+	 */
+	public BOB(I2PAppContext context, ClientAppManager mgr, String[] args) {
+		// If we were run from command line, log to stdout
+		boolean logToStdout = false;
+		URL classResource = BOB.class.getResource("BOB.class");
+		if (classResource != null) {
+		    String classPath = classResource.toString();
+		    if (classPath.startsWith("jar")) {
+		        String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) +
+		                "/META-INF/MANIFEST.MF";
+		        try {
+		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
+		            Attributes attrs = manifest.getMainAttributes();
+		            String mainClass = attrs.getValue("Main-Class");
+		            if ("net.i2p.BOB.Main".equals(mainClass))
+		                logToStdout = true;
+		        } catch (IOException ioe) {}
+		    }
+		}
+
+		_log = new Logger(context.logManager().getLog(BOB.class), logToStdout);
+
+		_mgr = mgr;
+		_args = args;
+		_state = INITIALIZED;
+		database = new NamedDB();
+		loadConfig();
 	}

 	/**
@@ -172,127 +190,169 @@ public class BOB {
 	 *
 	 * @param args
 	 */
-	public static void main(String[] args) {
-		database = new NamedDB();
-		ServerSocket listener = null;
+	public synchronized static void main(String[] args) {
+		try {
+			_bob = new BOB(I2PAppContext.getGlobalContext(), null, args);
+			_bob.startup();
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+			throw e;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void loadConfig() {
 		int i = 0;
 		boolean save = false;
 		// Set up all defaults to be passed forward to other threads.
 		// Re-reading the config file in each thread is pretty damn stupid.
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 		// This is here just to ensure there is no interference with our threadgroups.
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y1.hashCode();
 		i = Y2.hashCode();
-		try {
-			{
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					FileInputStream fi = new FileInputStream(cfg);
-					props.load(fi);
-					fi.close();
-				} catch (FileNotFoundException fnfe) {
-					warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.");
-					warn(fnfe.toString());
-					save = true;
-				} catch (IOException ioe) {
-					warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.");
-					warn(ioe.toString());
-				}
+		{
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
 			}
-			// Global router and client API configurations that are missing are set to defaults here.
-			if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
-				props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-				save = true;
-			}
-			if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
-				props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_PORT)) {
-				props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
-				save = true;
-			}
-			if (!props.containsKey("inbound.length")) {
-				props.setProperty("inbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("outbound.length")) {
-				props.setProperty("outbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("inbound.lengthVariance")) {
-				props.setProperty("inbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey("outbound.lengthVariance")) {
-				props.setProperty("outbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_HOST)) {
-				props.setProperty(PROP_BOB_HOST, "localhost");
-				save = true;
-			}
-			// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
-			if (!props.containsKey(PROP_CFG_VER)) {
-				props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
-				props.setProperty(PROP_CFG_VER,"1");
-				save = true;
-			}
-			if (save) {
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					warn("Writing new defaults file " + cfg.getAbsolutePath());
-					FileOutputStream fo = new FileOutputStream(cfg);
-					props.store(fo, cfg.getAbsolutePath());
-					fo.close();
-				} catch (IOException ioe) {
-					error("IOException on BOB config file " + cfg.getAbsolutePath() + ", " + ioe);
-				}
-			}
-
-			i = 0;
-			boolean g = false;
+			FileInputStream fi = null;
 			try {
-				info("BOB is now running.");
-				listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
-				Socket server = null;
-				listener.setSoTimeout(500); // .5 sec
-				
-				while (spin.get()) {
-					//DoCMDS connection;
-
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-
-					if (g) {
-						DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-						Thread t = new Thread(conn_c);
-						t.setName("BOB.DoCMDS " + i);
-						t.start();
-						i++;
-					}
-				}
+				fi = new FileInputStream(cfg);
+				props.load(fi);
+			} catch (FileNotFoundException fnfe) {
+				_log.warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.", fnfe);
+				save = true;
 			} catch (IOException ioe) {
-				error("IOException on socket listen: " + ioe);
-				ioe.printStackTrace();
+				_log.warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.", ioe);
+			} finally {
+				if (fi != null) try { fi.close(); } catch (IOException ioe) {}
 			}
+		}
+		// Global router and client API configurations that are missing are set to defaults here.
+		if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
+			props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+			save = true;
+		}
+		if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
+			props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_PORT)) {
+			props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
+			save = true;
+		}
+		if (!props.containsKey("inbound.length")) {
+			props.setProperty("inbound.length", "3");
+			save = true;
+		}
+		if (!props.containsKey("outbound.length")) {
+			props.setProperty("outbound.length", "3");
+			save = true;
+		}
+		if (!props.containsKey("inbound.lengthVariance")) {
+			props.setProperty("inbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey("outbound.lengthVariance")) {
+			props.setProperty("outbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_HOST)) {
+			props.setProperty(PROP_BOB_HOST, "localhost");
+			save = true;
+		}
+		// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
+		if (!props.containsKey(PROP_CFG_VER)) {
+			props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
+			props.setProperty(PROP_CFG_VER,"1");
+			save = true;
+		}
+		if (save) {
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+			}
+			FileOutputStream fo = null;
+			try {
+				_log.warn("Writing new defaults file " + cfg.getAbsolutePath());
+				fo = new FileOutputStream(cfg);
+				props.store(fo, cfg.getAbsolutePath());
+			} catch (IOException ioe) {
+				_log.error("IOException on BOB config file " + cfg.getAbsolutePath(), ioe);
+			} finally {
+				if (fo != null) try { fo.close(); } catch (IOException ioe) {}
+			}
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startListener() throws IOException {
+		listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
+		listener.setSoTimeout(500); // .5 sec
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startThread() {
+		I2PAppThread t = new I2PAppThread(this, "BOBListener");
+		t.start();
+		_runner = t;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	public void run() {
+		if (listener == null) return;
+		changeState(RUNNING);
+		_log.info("BOB is now running.");
+		if (_mgr != null)
+			_mgr.register(this);
+
+		int i = 0;
+		boolean g = false;
+		spin.set(true);
+		try {
+			Socket server = null;
+
+			while (spin.get()) {
+				//DoCMDS connection;
+
+				try {
+					server = listener.accept();
+					server.setKeepAlive(true);
+					g = true;
+				} catch (ConnectException ce) {
+					g = false;
+				} catch (SocketTimeoutException ste) {
+					g = false;
+				}
+
+				if (g) {
+					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
+					Thread t = new I2PAppThread(conn_c);
+					t.setName("BOB.DoCMDS " + i);
+					t.start();
+					i++;
+				}
+			}
+			changeState(STOPPING);
+		} catch (Exception e) {
+			if (spin.get())
+				_log.error("Unexpected error while listening for connections", e);
+			else
+				e = null;
+			changeState(STOPPING, e);
 		} finally {
-			info("BOB is now shutting down...");
+			_log.info("BOB is now shutting down...");
 			// Clean up everything.
 			try {
 				listener.close();
@@ -315,7 +375,7 @@ public class BOB {
 					database.releaseReadLock();
 					database.getWriteLock();
 					nickinfo.getWriteLock();
-					nickinfo.add(P_STOPPING, new Boolean(true));
+					nickinfo.add(P_STOPPING, Boolean.valueOf(true));
 					nickinfo.releaseWriteLock();
 					database.releaseWriteLock();
 				} else {
@@ -323,8 +383,8 @@ public class BOB {
 					database.releaseReadLock();
 				}
 			}
-			info("BOB is now stopped.");
-
+			changeState(STOPPED);
+			_log.info("BOB is now stopped.");
 		}
 	}

@@ -376,4 +436,86 @@ public class BOB {
 			waitjoin(groups[i], level + 1, groups[i].getName());
 		}
 	}
+
+	////// begin ClientApp interface
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void startup() throws IOException {
+		if (_state != INITIALIZED)
+			return;
+		changeState(STARTING);
+		try {
+			startListener();
+		} catch (IOException e) {
+			_log.error("Error starting BOB on"
+					+ props.getProperty(PROP_BOB_HOST)
+					+ ":" + props.getProperty(PROP_BOB_PORT), e);
+			changeState(START_FAILED, e);
+			throw e;
+		}
+		startThread();
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void shutdown(String[] args) {
+		if (_state != RUNNING)
+			return;
+		changeState(STOPPING);
+		spin.set(false);
+		if (_runner != null)
+			_runner.interrupt();
+		else
+			changeState(STOPPED);
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public ClientAppState getState() {
+		return _state;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getName() {
+		return "BOB";
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getDisplayName() {
+		return "BOB " + Arrays.toString(_args);
+	}
+
+	////// end ClientApp interface
+	////// begin ClientApp helpers
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private void changeState(ClientAppState state) {
+		changeState(state, null);
+	}
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private synchronized void changeState(ClientAppState state, Exception e) {
+		_state = state;
+		if (_mgr != null)
+			_mgr.notify(this, state, null, e);
+	}
+
+	////// end ClientApp helpers
 }
--- 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;

@@ -33,13 +25,13 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClientFactory;
-//import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-//import net.i2p.i2ptunnel.I2PTunnel;
-import net.i2p.util.Log;
+import net.i2p.util.I2PAppThread;
+
 // needed only for debugging.
 // import java.util.logging.Level;
 // import java.util.logging.Logger;
@@ -54,7 +46,7 @@ public class DoCMDS implements Runnable {

 	// FIX ME
 	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0F",  BEXT = "";
+	public static final String BMAJ = "00",  BMIN = "00",  BREV = "10",  BEXT = "";
 	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
 	private Socket server;
 	private Properties props;
@@ -64,7 +56,7 @@ public class DoCMDS implements Runnable {
 	private ByteArrayOutputStream prikey;
 	private boolean dk,  ns,  ip,  op;
 	private NamedDB nickinfo;
-	private Log _log;
+	private Logger _log;
 	private AtomicBoolean LIVE;
 	private AtomicBoolean lock;
 	/* database strings */
@@ -172,7 +164,7 @@ public class DoCMDS implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	DoCMDS(AtomicBoolean LIVE, AtomicBoolean lock, Socket server, Properties props, NamedDB database, Log _log) {
+	DoCMDS(AtomicBoolean LIVE, AtomicBoolean lock, Socket server, Properties props, NamedDB database, Logger _log) {
 		this.lock = lock;
 		this.LIVE = LIVE;
 		this.server = server;
@@ -396,7 +388,7 @@ public class DoCMDS implements Runnable {
 	 * Does the base64 information look OK
 	 *
 	 * @param data
-	 * @return
+	 * @return OK
 	 */
 	private boolean is64ok(String data) {
 		try {
@@ -614,7 +606,7 @@ public class DoCMDS implements Runnable {
 														break die;
 													}
 												} catch (I2PException ipe) {
-													BOB.error("Error generating keys" + ipe);
+													_log.error("Error generating keys", ipe);
 													out.println("ERROR generating keys");
 												}

@@ -673,7 +665,7 @@ public class DoCMDS implements Runnable {
 													break die;
 												}
 												try {
-													nickinfo.add(P_QUIET, new Boolean(Boolean.parseBoolean(Arg) == true));
+													nickinfo.add(P_QUIET, Boolean.valueOf(Arg));
 												} catch (Exception ex) {
 													try {
 														wunlock();
@@ -825,10 +817,10 @@ public class DoCMDS implements Runnable {
 										try {
 											database.add(Arg, nickinfo);
 											nickinfo.add(P_NICKNAME, Arg);
-											nickinfo.add(P_STARTING, new Boolean(false));
-											nickinfo.add(P_RUNNING, new Boolean(false));
-											nickinfo.add(P_STOPPING, new Boolean(false));
-											nickinfo.add(P_QUIET, new Boolean(false));
+											nickinfo.add(P_STARTING, Boolean.valueOf(false));
+											nickinfo.add(P_RUNNING, Boolean.valueOf(false));
+											nickinfo.add(P_STOPPING, Boolean.valueOf(false));
+											nickinfo.add(P_QUIET, Boolean.valueOf(false));
 											nickinfo.add(P_INHOST, "localhost");
 											nickinfo.add(P_OUTHOST, "localhost");
 											Properties Q = new Properties();
@@ -997,7 +989,7 @@ public class DoCMDS implements Runnable {
 													prt = Integer.parseInt(Arg);
 													if (prt > 1 && prt < 65536) {
 														try {
-															nickinfo.add(P_INPORT, new Integer(prt));
+															nickinfo.add(P_INPORT, Integer.valueOf(prt));
 														} catch (Exception ex) {
 															try {
 																wunlock();
@@ -1084,7 +1076,7 @@ public class DoCMDS implements Runnable {
 													prt = Integer.parseInt(Arg);
 													if (prt > 1 && prt < 65536) {
 														try {
-															nickinfo.add(P_OUTPORT, new Integer(prt));
+															nickinfo.add(P_OUTPORT, Integer.valueOf(prt));
 														} catch (Exception ex) {
 															try {
 																wunlock();
@@ -1316,7 +1308,7 @@ public class DoCMDS implements Runnable {
 														// wait
 													}
 													tunnel = new MUXlisten(lock, database, nickinfo, _log);
-													Thread t = new Thread(tunnel);
+													Thread t = new I2PAppThread(tunnel);
 													t.start();
 													// try {
 													//	Thread.sleep(1000 * 10); // Slow down the startup.
@@ -1363,7 +1355,7 @@ public class DoCMDS implements Runnable {
 													break die;
 												}

-												nickinfo.add(P_STOPPING, new Boolean(true));
+												nickinfo.add(P_STOPPING, Boolean.valueOf(true));
 												try {
 													wunlock();

--- 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,18 +11,19 @@
 *	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;

 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.Log;
+import net.i2p.util.I2PAppThread;

 /**
 * Listen on I2P and connect to TCP
@@ -39,26 +32,23 @@ import net.i2p.util.Log;
 */
 public class I2Plistener implements Runnable {

-	private NamedDB info,  database;
-	private Log _log;
-//	private int tgwatch;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private AtomicBoolean lives;
+	private final NamedDB info,  database;
+	private final Logger _log;
+	private final I2PServerSocket serverSocket;
+	private final AtomicBoolean lives;

 	/**
 	 * Constructor
 	 * @param SS
-	 * @param S
+	 * @param S unused
 	 * @param info
 	 * @param database
 	 * @param _log
 	 */
-	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
-		this.socketManager = S;
 		this.serverSocket = SS;
 		this.lives = lives;
 	}
@@ -89,13 +79,13 @@ public class I2Plistener implements Runnable {
 						conn++;
 						// toss the connection to a new thread.
 						I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
 						t.start();
 					}

 				}
 			} catch (I2PException e) {
-				// bad shit
+				// bad stuff
 				System.out.println("Exception " + e);
 			}
 		} finally {
@@ -103,7 +93,7 @@ public class I2Plistener implements Runnable {
 				serverSocket.close();
 			} catch (I2PException ex) {
 			}
-		// System.out.println("I2Plistener: Close");
+			// System.out.println("I2Plistener: Close");
 		}
 	}
 }
--- 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;

@@ -27,7 +19,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.client.streaming.I2PSocket;
+import net.i2p.data.DataHelper;
+import net.i2p.util.I2PAppThread;

 /**
 * Process I2P->TCP
@@ -112,15 +107,15 @@ public class I2PtoTCP implements Runnable {

 					if (tell) {
 						// tell who is connecting
-						out.write(I2P.getPeerDestination().toBase64().getBytes());
+						out.write(DataHelper.getASCII(I2P.getPeerDestination().toBase64()));
 						out.write(10); // nl
 						out.flush(); // not really needed, but...
 					}
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();
--- 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,11 +11,11 @@
 *	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;

-import java.util.Enumeration;
+import java.util.Map;
 import java.util.Properties;

 /**
@@ -47,10 +39,8 @@ public class Lifted {
 	 *
 	 **/
 	public static void copyProperties(Properties src_prop, Properties dest_prop) {
-		for (Enumeration propertyNames = src_prop.propertyNames();
-			propertyNames.hasMoreElements();) {
-			Object key = propertyNames.nextElement();
-			dest_prop.put(key, src_prop.get(key));
+		for (Map.Entry<Object, Object> e : src_prop.entrySet()) {
+			dest_prop.put((String)e.getKey(), (String)e.getValue());
 		}
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/Logger.java
+++ b/apps/BOB/src/net/i2p/BOB/Logger.java
@@ -0,0 +1,44 @@
+package net.i2p.BOB;
+
+import net.i2p.util.Log;
+
+public class Logger {
+	public Log log;
+	private boolean logToStdout;
+
+	public Logger(Log log, boolean logToStdout) {
+		this.log = log;
+		this.logToStdout = logToStdout;
+	}
+
+	public void info(String msg) {
+		if (logToStdout)
+			System.out.println("INFO: " + msg);
+		if (log.shouldLog(Log.INFO))
+			log.info(msg);
+	}
+
+	public void warn(String msg) {
+		warn(msg, null);
+	}
+
+	public void warn(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("WARNING: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.WARN))
+			log.warn(msg, e);
+	}
+
+	public void error(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("ERROR: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.ERROR))
+			log.error(msg, e);
+	}
+}
--- 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;

@@ -29,10 +21,13 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;

 /**
@@ -44,7 +39,7 @@ import net.i2p.util.Log;
 public class MUXlisten implements Runnable {

 	private NamedDB database,  info;
-	private Log _log;
+	private Logger _log;
 	private I2PSocketManager socketManager;
 	private ByteArrayInputStream prikey;
 	private ThreadGroup tg;
@@ -65,7 +60,7 @@ public class MUXlisten implements Runnable {
 	 * @throws net.i2p.I2PException
 	 * @throws java.io.IOException
 	 */
-	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Log _log) throws I2PException, IOException, RuntimeException {
+	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Logger _log) throws I2PException, IOException, RuntimeException {
 		try {
 			int port = 0;
 			InetAddress host = null;
@@ -78,7 +73,7 @@ public class MUXlisten implements Runnable {

 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(true));
+			this.info.add("STARTING", Boolean.valueOf(true));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			this.database.getReadLock();
@@ -104,25 +99,25 @@ public class MUXlisten implements Runnable {
 			this.database.releaseReadLock();
 			this.info.releaseReadLock();

+			String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
+			int i2cpPort = 7654;
+			String i2cpPortStr = Q.getProperty(I2PClient.PROP_TCP_PORT, "7654");
+			try {
+				i2cpPort = Integer.parseInt(i2cpPortStr);
+			} catch (NumberFormatException nfe) {
+				throw new IllegalArgumentException("Invalid I2CP port specified [" + i2cpPortStr + "]");
+			}
+
 			if (this.come_in) {
 				this.listener = new ServerSocket(port, backlog, host);
 			}
-			socketManager = I2PSocketManagerFactory.createManager(prikey, Q);
-		// I2PException, IOException, RuntimeException
-		// To bad we can't just catch and enumerate....
-		// } catch (I2PException e) {
-		// Something went bad.
-		//	this.database.getWriteLock();
-		//	this.info.getWriteLock();
-		//	this.info.add("STARTING", new Boolean(false));
-		//	this.info.releaseWriteLock();
-		//	this.database.releaseWriteLock();
-		//	throw new I2PException(e);
+			socketManager = I2PSocketManagerFactory.createManager(
+					prikey, i2cpHost, i2cpPort, Q);
 		} catch (IOException e) {
 			// Something went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			throw new IOException(e.toString());
@@ -130,7 +125,7 @@ public class MUXlisten implements Runnable {
 			// Something went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			throw new RuntimeException(e);
@@ -138,7 +133,7 @@ public class MUXlisten implements Runnable {
 			// Something else went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			e.printStackTrace();
@@ -178,7 +173,7 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("RUNNING", new Boolean(true));
+					info.add("RUNNING", Boolean.valueOf(true));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
@@ -194,7 +189,6 @@ public class MUXlisten implements Runnable {
 				lock.set(false);
 				return;
 			}
-//		socketManager.addDisconnectListener(new DisconnectListener());
 			lives.set(true);
 			lock.set(false);
 			quit:
@@ -209,21 +203,21 @@ public class MUXlisten implements Runnable {
 							// I2P -> TCP
 							SS = socketManager.getServerSocket();
 							I2Plistener conn = new I2Plistener(SS, socketManager, info, database, _log, lives);
-							t = new Thread(tg, conn, "BOBI2Plistener " + N);
+							t = new I2PAppThread(tg, conn, "BOBI2Plistener " + N);
 							t.start();
 						}

 						if (come_in) {
 							// TCP -> I2P
 							TCPlistener conn = new TCPlistener(listener, socketManager, info, database, _log, lives);
-							q = new Thread(tg, conn, "BOBTCPlistener " + N);
+							q = new I2PAppThread(tg, conn, "BOBTCPlistener " + N);
 							q.start();
 						}

 						try {
 							wlock();
 							try {
-								info.add("STARTING", new Boolean(false));
+								info.add("STARTING", Boolean.valueOf(false));
 							} catch (Exception e) {
 								wunlock();
 								break quit;
@@ -277,9 +271,9 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(true));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.valueOf(false));
+					info.add("STOPPING", Boolean.valueOf(true));
+					info.add("RUNNING", Boolean.valueOf(false));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
@@ -313,14 +307,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());
 				}
 			}
@@ -328,9 +322,9 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(false));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.valueOf(false));
+					info.add("STOPPING", Boolean.valueOf(false));
+					info.add("RUNNING", Boolean.valueOf(false));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
@@ -344,26 +338,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);
-				// tg.interrupt(); // give my stuff a small smack again.
+				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 {
@@ -373,8 +366,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;
--- 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,11 +11,10 @@
 *	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;

-import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;

 /**
@@ -39,12 +30,10 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();

 		BOB.main(args);

 		Y2.stop();
-		Y1.stop();
 	}
 }
--- 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;

@@ -31,7 +23,7 @@ package net.i2p.BOB;
 public class NamedDB {

 	private volatile Object[][] data;
-	private volatile int index,  writersWaiting,  readers;
+	private int index,  writersWaiting,  readers;

 	/**
 	 * make initial NULL object
@@ -39,7 +31,6 @@ public class NamedDB {
 	 */
 	public NamedDB() {
 		this.data = new Object[1][2];
-		this.index = this.writersWaiting = this.readers = 0;
 	}

 	synchronized public void getReadLock() {
@@ -73,7 +64,7 @@ public class NamedDB {
 	}

 	/**
-	 * Find objects in the array, returns it's index or throws exception
+	 * Find objects in the array, returns its index or throws exception
 	 * @param key
 	 * @return an objects index
 	 * @throws ArrayIndexOutOfBoundsException when key does not exist
--- 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;

@@ -95,14 +87,9 @@ public class TCPio implements Runnable {
 					if (b > 0) {
 						Aout.write(a, 0, b);
 					} else if (b == 0) {
-// Will this die? We'll see.
 						while(Ain.available() == 0) {
 							Thread.sleep(20);
 						}
-//						Thread.yield(); // this should act like a mini sleep.
-//						if (Ain.available() == 0) {
-//							Thread.sleep(10);
-//						}
 					} else {
 						/* according to the specs:
 						 *
@@ -129,7 +116,6 @@ public class TCPio implements Runnable {
 				Aout.close();
 			} catch (IOException ex) {
 			}
-			return;
 		}
 	}
 }
--- 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;

@@ -27,12 +19,11 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-// import net.i2p.client.I2PSession;
-// import net.i2p.client.I2PSessionException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.Log;
+import net.i2p.util.I2PAppThread;

 /**
 * Listen on TCP port and connect to I2P
@@ -41,12 +32,11 @@ import net.i2p.util.Log;
 */
 public class TCPlistener implements Runnable {

-	private NamedDB info,  database;
-	private Log _log;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private ServerSocket listener;
-	private AtomicBoolean lives;
+	private final NamedDB info,  database;
+	private final Logger _log;
+	private final I2PSocketManager socketManager;
+	private final ServerSocket listener;
+	private final AtomicBoolean lives;

 	/**
 	 * Constructor
@@ -55,7 +45,7 @@ public class TCPlistener implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
@@ -87,7 +77,7 @@ public class TCPlistener implements Runnable {
 						conn++;
 						// toss the connection to a new thread.
 						TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
 						t.start();
 						g = false;
 					}
--- 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;

@@ -32,13 +24,14 @@ import java.net.NoRouteToHostException;
 import java.net.Socket;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-//import net.i2p.i2ptunnel.I2PTunnel;
-import net.i2p.I2PAppContext;
+import net.i2p.util.I2PAppThread;

 /**
 *
@@ -78,12 +71,10 @@ public class TCPtoI2P implements Runnable {
 	 * @throws IOException
 	 */
 	private static String lnRead(InputStream in) throws IOException {
-		String S;
+		StringBuilder builder = new StringBuilder();
 		int b;
 		char c;

-		S = new String();
-
 		while (true) {
 			b = in.read();
 			if (b == 13) {
@@ -94,10 +85,10 @@ public class TCPtoI2P implements Runnable {
 				// exit on anything not legal
 				break;
 			}
-			c = (char) (b & 0x7f); // We only really give a fuck about ASCII
-			S = new String(S + c);
+			c = (char) (b & 0x7f); // We only care about ASCII
+			builder.append(c);
 		}
-		return S;
+		return builder.toString();
 	}

 	/**
@@ -108,20 +99,18 @@ public class TCPtoI2P implements Runnable {
 	 * @throws java.io.IOException
 	 */
 	private void Emsg(String e, OutputStream out) throws IOException {
-// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
-		out.write("ERROR ".concat(e).getBytes());
+		// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
+		out.write("ERROR ".concat(e).getBytes("UTF-8"));
 		out.write(13);
 		out.write(10);
 		out.flush();
 	}

-//	private void rlock() throws Exception {
 	private void rlock() {
 		database.getReadLock();
 		info.getReadLock();
 	}

-//	private void runlock() throws Exception {
 	private void runlock() {
 		info.releaseReadLock();
 		database.releaseReadLock();
@@ -170,8 +159,8 @@ public class TCPtoI2P implements Runnable {
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();
--- 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;

@@ -42,15 +34,17 @@ import net.i2p.util.Log;
 *  The skeletal frame is here, just needs to be finished.
 *
 * @author sponge
+ * @deprecated incomplete, unused
 */
 public class UDPIOthread implements I2PSessionListener, Runnable {

-	private NamedDB info;
-	private Log _log;
-	private Socket socket;
+	private final NamedDB info;
+	private final Log _log;
+	private final Socket socket;
 	private DataInputStream in;
 	private DataOutputStream out;
-	private I2PSession _session;
+	private final I2PSession _session;
+	// FIXME never set
 	private Destination _peerDestination;
 	private boolean up;

@@ -66,7 +60,6 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 		this._log = _log;
 		this.socket = socket;
 		this._session = _session;
-
 	}

 	/**
@@ -111,11 +104,13 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 	 * @param size
 	 */
 	public void messageAvailable(I2PSession session, int msgId, long size) {
-//		_log.debug("Message available: id = " + msgId + " size = " + size);
+		//		_log.debug("Message available: id = " + msgId + " size = " + size);
 		try {
 			byte msg[] = session.receiveMessage(msgId);
-			out.write(msg);
-			out.flush();
+			if (msg != null) {
+				out.write(msg);
+				out.flush();
+			}
 		} catch (I2PSessionException ise) {
 			up = false;
 		} catch (IOException ioe) {
--- a/apps/addressbook/.classpath
+++ b/apps/addressbook/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="java/src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/apps/addressbook/.project
+++ b/apps/addressbook/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>addressbook</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -7,6 +7,7 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
+	<property name="javac.version" value="1.6" />
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -24,6 +25,18 @@
            <typefound name="depend" />
        </condition>
        <target name="depend" if="depend.available">
+            <depend
+                cache="../../build"
+                srcdir="${src}"
+                destdir="${build}" >
+                <!-- Depend on classes instead of jars where available -->
+                <classpath>
+                    <pathelement location="../../core/java/build/obj" />
+                </classpath>
+            </depend>
+        </target>
+
+        <target name="dependServlet" if="depend.available">
            <depend
                cache="../../build"
                srcdir="${src}"
@@ -37,9 +50,22 @@
        </target>

 	<target name="compile" depends="init, depend">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                       includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}">
+                       srcdir="${src}" destdir="${build}"
+                       excludes="net/i2p/addressbook/Servlet.java">
+            <compilerarg line="${javac.compilerargs}" />
+            <classpath>
+                <pathelement location="../../core/java/build/i2p.jar" />
+            </classpath>
+		</javac>
+	</target>
+
+	<target name="compileServlet" depends="init, dependServlet, compile">
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       includeAntRuntime="false"
+                       srcdir="${src}" destdir="${build}"
+                       includes="net/i2p/addressbook/Servlet.java">
            <compilerarg line="${javac.compilerargs}" />
            <classpath>
                <pathelement location="../../core/java/build/i2p.jar" />
@@ -48,11 +74,11 @@
 		</javac>
 	</target>

-        <!-- unused for now, as we oddly ship addressbook as a .war -->
+        <!-- unused for now (except for Android), as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
-		<jar basedir="${build}" destfile="${dist}/${jar}">
 		<!-- set if unset -->
 		<property name="workspace.changes" value="" />
+		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
 				<attribute name="Implementation-Version" value="${full.version}" />
@@ -64,7 +90,7 @@
 		</jar>
 	</target>
 	
-	<target name="war" depends="compile, changes, warUpToDate" unless="war.uptodate">
+	<target name="war" depends="compileServlet, changes, warUpToDate" unless="war.uptodate">
 		<mkdir dir="${dist}/tmp"/>
 		<mkdir dir="${dist}/tmp/WEB-INF"/>
 		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
--- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.regex.Pattern;

 import net.i2p.I2PAppContext;
 import net.i2p.util.EepGet;
@@ -49,6 +50,26 @@ class AddressBook {
    private boolean modified;
    private static final boolean DEBUG = false;

+    private static final int MIN_DEST_LENGTH = 516;
+    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
+
+    /**
+     * 5-67 chars lower/upper case
+     */
+    private static final Pattern HOST_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z\\.-]{5,67}$");
+
+    /**
+     * 52 chars lower/upper case
+     * Always ends in 'a' or 'q'
+     */
+    private static final Pattern B32_PATTERN =
+        Pattern.compile("^[2-7a-zA-Z]{51}[aAqQ]$");
+
+    /** not a complete qualification, just a quick check */
+    private static final Pattern B64_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z~-]{" + MIN_DEST_LENGTH + ',' + MAX_DEST_LENGTH + "}={0,2}$");
+
    /**
     * Construct an AddressBook from the contents of the Map addresses.
     * 
@@ -120,11 +141,11 @@ class AddressBook {
                subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
                subf = tmp;
            } else {
-                a = Collections.EMPTY_MAP;
+                a = Collections.emptyMap();
                tmp.delete();
            }
        } catch (IOException ioe) {
-            a = Collections.EMPTY_MAP;
+            a = Collections.emptyMap();
        }
        this.addresses = a;
        this.subFile = subf;
@@ -148,7 +169,7 @@ class AddressBook {
        try {
            a = ConfigParser.parse(file);
        } catch (IOException exp) {
-            a = new HashMap();
+            a = new HashMap<String, String>();
        }
        this.addresses = a;
        this.subFile = null;
@@ -159,8 +180,13 @@ class AddressBook {
     * @since 0.8.7
     */
    public Iterator<Map.Entry<String, String>> iterator() {
-        if (this.subFile != null)
-            return new ConfigIterator(this.subFile);
+        if (this.subFile != null) {
+            try {
+                return new ConfigIterator(this.subFile);
+            } catch (IOException ioe) {
+                return new ConfigIterator();
+            }
+       }
        return this.addresses.entrySet().iterator();
    }

@@ -201,9 +227,6 @@ class AddressBook {
        return "Map containing " + this.addresses.size() + " entries";
    }

-    private static final int MIN_DEST_LENGTH = 516;
-    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
-
    /**
     * Do basic validation of the hostname
     * hostname was already converted to lower case by ConfigParser.parse()
@@ -220,9 +243,10 @@ class AddressBook {
 		host.indexOf("..") < 0 &&
                // IDN - basic check, not complete validation
                (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
-                host.replaceAll("[a-z0-9.-]", "").length() == 0 &&
+                HOST_PATTERN.matcher(host).matches() &&
                // Base32 spoofing (52chars.i2p)
-                (! (host.length() == 56 && host.substring(0,52).replaceAll("[a-z2-7]", "").length() == 0)) &&
+                // We didn't do it this way, we use a .b32.i2p suffix, but let's prohibit it anyway
+                (! (host.length() == 56 && B32_PATTERN.matcher(host.substring(0,52)).matches())) &&
                // ... or maybe we do Base32 this way ...
                (! host.equals("b32.i2p")) &&
                (! host.endsWith(".b32.i2p")) &&
@@ -246,7 +270,7 @@ class AddressBook {
 		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
 		// B64 comes in groups of 2, 3, or 4 chars, but never 1
 		((dest.length() % 4) != 1) &&
-                dest.replaceAll("[a-zA-Z0-9~-]", "").length() == 0
+                B64_PATTERN.matcher(dest).matches()
                ;	
    }

@@ -260,7 +284,7 @@ class AddressBook {
     *            An AddressBook to merge with.
     * @param overwrite True to overwrite
     * @param log
-     *            The log to write messages about new addresses or conflicts to.
+     *            The log to write messages about new addresses or conflicts to. May be null.
     *
     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
@@ -332,4 +356,27 @@ class AddressBook {
    protected void finalize() {
        delete();
    }
+
+/****
+    public static void main(String[] args) {
+        String[] tests = { "foo.i2p",
+                           "3bnipzzu67cdq2rcygyxz52xhvy6ylokn4zfrk36ywn6pixmaoza.b32.i2p",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA==",
+                           "te9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "(*&(*&(*&(*",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA===",
+                           "!e9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "x"
+        };
+        for (String s : tests) {
+            test(s);
+        }
+    }
+
+    public static void test(String s) {
+        System.out.println(s + " valid host? " + isValidKey(s) + " valid dest? " + isValidDest(s));
+    }
+****/
 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
@@ -22,6 +22,7 @@
 package net.i2p.addressbook;

 import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -31,6 +32,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;

+import net.i2p.data.DataHelper;
+
 /**
 *  A class to iterate through a hosts.txt or config file without
 *  reading the whole thing into memory.
@@ -41,7 +44,7 @@ import java.util.NoSuchElementException;
 *
 *  @since 0.8.7
 */
-class ConfigIterator implements Iterator<Map.Entry<String, String>> {
+class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {

    private BufferedReader input;
    private ConfigEntry next;
@@ -54,11 +57,9 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
    /**
     *  An iterator over the key/value pairs in the file.
     */
-    public ConfigIterator(File file) {
-        try {
+    public ConfigIterator(File file) throws IOException {
            FileInputStream fileStream = new FileInputStream(file);
-            input = new BufferedReader(new InputStreamReader(fileStream));
-        } catch (IOException ioe) {}
+            input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8"));
    }

    public boolean hasNext() {
@@ -70,7 +71,7 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
            String inputLine = input.readLine();
            while (inputLine != null) {
                inputLine = ConfigParser.stripComments(inputLine);
-                String[] splitLine = inputLine.split("=");
+                String[] splitLine = DataHelper.split(inputLine, "=");
                if (splitLine.length == 2) {
                    next = new ConfigEntry(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
                    return true;
@@ -138,7 +139,8 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
        public boolean equals(Object o) {
            if (!(o instanceof Map.Entry))
                return false;
-            Map.Entry e = (Map.Entry) o;
+            @SuppressWarnings("unchecked")
+            Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) o;
            return key.equals(e.getKey()) && value.equals(e.getValue());
        }
    }
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
@@ -35,8 +35,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;

+import net.i2p.data.DataHelper;
 import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;

 /**
 * Utility class providing methods to parse and write files in config file
@@ -49,7 +51,7 @@ import net.i2p.util.SecureFileOutputStream;
 */
 class ConfigParser {

-    private static final boolean isWindows = System.getProperty("os.name").startsWith("Win");
+    private static final boolean isWindows = SystemVersion.isWindows();

    /**
     * Strip the comments from a String. Lines that begin with '#' and ';' are
@@ -63,10 +65,11 @@ class ConfigParser {
        if (inputLine.startsWith(";")) {
            return "";
        }
-        if (inputLine.split("#").length > 0) {
-            return inputLine.split("#")[0];
+        int hash = inputLine.indexOf('#');
+        if (hash >= 0) {
+            return inputLine.substring(0, hash);
        } else {
-            return "";
+            return inputLine;
        }
    }

@@ -86,12 +89,12 @@ class ConfigParser {
     *  
     */
    public static Map<String, String>  parse(BufferedReader input) throws IOException {
-        Map<String, String>  result = new HashMap();
+        Map<String, String>  result = new HashMap<String, String>();
        String inputLine;
        inputLine = input.readLine();
        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine);
-            String[] splitLine = inputLine.split("=");
+            inputLine = stripComments(inputLine);
+            String[] splitLine = DataHelper.split(inputLine, "=");
            if (splitLine.length == 2) {
                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
            }
@@ -114,8 +117,8 @@ class ConfigParser {
    public static Map<String, String>  parse(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        Map<String, String>  rv = ConfigParser.parse(input);
+                fileStream, "UTF-8"));
+        Map<String, String>  rv = parse(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -135,7 +138,7 @@ class ConfigParser {
    public static Map<String, String>  parse(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parse(input);
+        return parse(input);
    }
    
    /**
@@ -152,7 +155,7 @@ class ConfigParser {
    public static Map<String, String>  parse(File file, Map<String, String>  map) {
        Map<String, String>  result;
        try {
-            result = ConfigParser.parse(file);
+            result = parse(file);
            for (Map.Entry<String, String> entry : map.entrySet()) {
                if (!result.containsKey(entry.getKey()))
                    result.put(entry.getKey(), entry.getValue());
@@ -160,7 +163,7 @@ class ConfigParser {
        } catch (IOException exp) {
            result = map;
            try {
-                ConfigParser.write(result, file);
+                write(result, file);
            } catch (IOException exp2) {
            }
        }
@@ -178,10 +181,10 @@ class ConfigParser {
     */
    public static List<String> parseSubscriptions(BufferedReader input)
            throws IOException {
-        List<String> result = new LinkedList();
+        List<String> result = new LinkedList<String>();
        String inputLine = input.readLine();
        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine).trim();
+            inputLine = stripComments(inputLine).trim();
            if (inputLine.length() > 0) {
                result.add(inputLine);
            }
@@ -203,8 +206,8 @@ class ConfigParser {
    public static List<String> parseSubscriptions(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        List<String> rv = ConfigParser.parseSubscriptions(input);
+                fileStream, "UTF-8"));
+        List<String> rv = parseSubscriptions(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -223,7 +226,7 @@ class ConfigParser {
    public static List<String> parseSubscriptions(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parseSubscriptions(input);
+        return parseSubscriptions(input);
    }
    
    /**
@@ -233,18 +236,30 @@ class ConfigParser {
     * 
     * @param file
     *            A File to attempt to parse.
-     * @param list list of files to parse
+     * @param list The default subscriptions to be saved and returned if the file cannot be read
     * @return A List consisting of one element for each line in file, or if
     *         file cannot be read, list.
     */
    public static List<String> parseSubscriptions(File file, List<String> list) {
        List<String> result;
        try {
-            result = ConfigParser.parseSubscriptions(file);
+            result = parseSubscriptions(file);
+            // Fix up files that contain the old default
+            // which was changed in 0.9.11
+            if (result.remove(Daemon.OLD_DEFAULT_SUB)) {
+                for (String sub : list) {
+                    if (!result.contains(sub))
+                        result.add(sub);
+                }
+                try {
+                    writeSubscriptions(result, file);
+                    // TODO log
+                } catch (IOException ioe) {}
+            }
        } catch (IOException exp) {
            result = list;
            try {
-                ConfigParser.writeSubscriptions(result, file);
+                writeSubscriptions(result, file);
            } catch (IOException exp2) {
            }
        }
@@ -288,8 +303,7 @@ class ConfigParser {
        boolean success = false;
        if (!isWindows) {
            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
            success = tmp.renameTo(file);
            if (!success) {
                tmp.delete();
@@ -298,8 +312,7 @@ class ConfigParser {
        }
        if (!success) {
            // hmm, that didn't work, try it the old way
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
        }
    }

@@ -336,7 +349,7 @@ class ConfigParser {
     */
    public static void writeSubscriptions(List<String> list, File file)
            throws IOException {
-        ConfigParser.writeSubscriptions(list, new BufferedWriter(
+        writeSubscriptions(list, new BufferedWriter(
                new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -37,6 +37,7 @@ import net.i2p.client.naming.SingleFileNamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.SecureDirectory;
+import net.i2p.util.SystemVersion;

 /**
 * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -47,8 +48,11 @@ import net.i2p.util.SecureDirectory;
 public class Daemon {
    public static final String VERSION = "2.0.4";
    private static final Daemon _instance = new Daemon();
-    private boolean _running;
+    private volatile boolean _running;
    private static final boolean DEBUG = false;
+    private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
+    /** @since 0.9.12 */
+    static final String OLD_DEFAULT_SUB = "http://www.i2p2.i2p/hosts.txt";
    
    /**
     * Update the router and published address books using remote data from the
@@ -168,7 +172,7 @@ public class Daemon {
                                if (publishedNS == null)
                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
                                success = publishedNS.putIfAbsent(key, dest);
-                                if (!success) {
+                                if (log != null && !success) {
                                    try {
                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
                                    } catch (IOException ioe) {}
@@ -230,7 +234,7 @@ public class Daemon {
     */
    public static void update(Map<String, String> settings, String home) {
        File published = null;
-        boolean should_publish = Boolean.valueOf(settings.get("should_publish")).booleanValue();
+        boolean should_publish = Boolean.parseBoolean(settings.get("should_publish"));
        if (should_publish) 
            published = new File(home, settings
                .get("published_addressbook"));
@@ -250,18 +254,18 @@ public class Daemon {
        }
        delay *= 60 * 60 * 1000;
        
-        List<String> defaultSubs = new LinkedList();
+        List<String> defaultSubs = new LinkedList<String>();
        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
-        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
+        defaultSubs.add(DEFAULT_SUB);
        
        SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
-        Log log = new Log(logFile);
+        Log log = SystemVersion.isAndroid() ? null : new Log(logFile);

        // If false, add hosts via naming service; if true, write hosts.txt file directly
        // Default false
-        if (Boolean.valueOf(settings.get("update_direct")).booleanValue()) {
+        if (Boolean.parseBoolean(settings.get("update_direct"))) {
            // Direct hosts.txt access
            File routerFile = new File(home, settings.get("router_addressbook"));
            AddressBook master;
@@ -330,7 +334,7 @@ public class Daemon {
            homeFile = new SecureDirectory(System.getProperty("user.dir"));
        }
        
-        Map<String, String> defaultSettings = new HashMap();
+        Map<String, String> defaultSettings = new HashMap<String, String>();
        defaultSettings.put("proxy_host", "127.0.0.1");
        defaultSettings.put("proxy_port", "4444");
        defaultSettings.put("master_addressbook", "../userhosts.txt");
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -25,6 +25,7 @@ import java.util.Properties;

 import net.i2p.I2PAppContext;
 import net.i2p.client.naming.NamingServiceUpdater;
+import net.i2p.util.I2PAppThread;

 /**
 * A thread that waits five minutes, then runs the addressbook daemon.  
@@ -32,7 +33,7 @@ import net.i2p.client.naming.NamingServiceUpdater;
 * @author Ragnarok
 *
 */
-public class DaemonThread extends Thread implements NamingServiceUpdater {
+public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {

    private String[] args;

--- a/apps/addressbook/java/src/net/i2p/addressbook/Log.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Log.java
@@ -23,8 +23,9 @@ package net.i2p.addressbook;

 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.Date;

 /**
@@ -56,8 +57,8 @@ class Log {
    public void append(String entry) {
        BufferedWriter bw = null;
        try {
-            bw = new BufferedWriter(new FileWriter(this.file,
-                    true));
+            bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(this.file,
+                    true), "UTF-8"));
            String timestamp = new Date().toString();
            bw.write(timestamp + " -- " + entry);
            bw.newLine();
--- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
@@ -41,9 +41,11 @@ import javax.servlet.http.HttpServletResponse;
 *
 */
 public class Servlet extends HttpServlet {
-    private DaemonThread thread;
-    private String nonce;
-    private static final String PROP_NONCE = "addressbook.nonce";
+
+    private static final long serialVersionUID = 1L;
+    private transient DaemonThread thread;
+    //private String nonce;
+    //private static final String PROP_NONCE = "addressbook.nonce";

    /**
     * Hack to allow susidns to kick the daemon when the subscription list changes.
@@ -54,15 +56,15 @@ public class Servlet extends HttpServlet {
     */
    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
        //System.err.println("Got request nonce = " + request.getParameter("nonce"));
-        if (this.thread != null && request.getParameter("wakeup") != null &&
-            this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
-            //System.err.println("Sending interrupt");
-            this.thread.interrupt();
-            // no output
-        } else {
+        //if (this.thread != null && request.getParameter("wakeup") != null &&
+        //    this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
+        //    //System.err.println("Sending interrupt");
+        //    this.thread.interrupt();
+        //    // no output
+        //} else {
            PrintWriter out = response.getWriter();
            out.write("I2P addressbook OK");
-        }
+        //}
    }

    /* (non-Javadoc)
@@ -75,9 +77,9 @@ public class Servlet extends HttpServlet {
        } catch (ServletException exp) {
            System.err.println("Addressbook init exception: " + exp);
        }
-        this.nonce = "" + Math.abs((new Random()).nextLong());
+        //this.nonce = "" + Math.abs((new Random()).nextLong());
        // put the nonce where susidns can get it
-        System.setProperty(PROP_NONCE, this.nonce);
+        //System.setProperty(PROP_NONCE, this.nonce);
        String[] args = new String[1];
        args[0] = config.getInitParameter("home");
        this.thread = new DaemonThread(args);
--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;

 import net.i2p.I2PAppContext;
+import net.i2p.util.PortMapper;

 /**
 * An iterator over the subscriptions in a SubscriptionList.  Note that this iterator
@@ -69,11 +70,14 @@ class SubscriptionIterator implements Iterator<AddressBook> {
     * Yes, the EepGet fetch() is done in here in next().
     *
     * see java.util.Iterator#next()
-     * @return an AddressBook (empty if the minimum delay has not been met)
+     * @return non-null AddressBook (empty if the minimum delay has not been met,
+     *          or there is no proxy tunnel, or the fetch otherwise fails)
     */
    public AddressBook next() {
        Subscription sub = this.subIterator.next();
-        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now()) {
+        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
+            I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
+            !I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
            //System.err.println("Fetching addressbook from " + sub.getLocation());
            return new AddressBook(sub, this.proxyHost, this.proxyPort);
        } else {
@@ -81,7 +85,7 @@ class SubscriptionIterator implements Iterator<AddressBook> {
            //                   DataHelper.formatDuration(I2PAppContext.getGlobalContext().clock().now() - sub.getLastFetched()) +
            //                   " ago but the minimum delay is " +
            //                   DataHelper.formatDuration(this.delay));
-            return new AddressBook(Collections.EMPTY_MAP);
+            return new AddressBook(Collections.<String, String> emptyMap());
        }
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
@@ -69,7 +69,7 @@ class SubscriptionList {
    public SubscriptionList(File locationsFile, File etagsFile,
            File lastModifiedFile, File lastFetchedFile, long delay, List<String> defaultSubs, String proxyHost, 
            int proxyPort) {
-        this.subscriptions = new LinkedList();
+        this.subscriptions = new LinkedList<Subscription>();
        this.etagsFile = etagsFile;
        this.lastModifiedFile = lastModifiedFile;
        this.lastFetchedFile = lastFetchedFile;
@@ -84,17 +84,17 @@ class SubscriptionList {
        try {
            etags = ConfigParser.parse(etagsFile);
        } catch (IOException exp) {
-            etags = new HashMap();
+            etags = new HashMap<String, String>();
        }
        try {
            lastModified = ConfigParser.parse(lastModifiedFile);
        } catch (IOException exp) {
-            lastModified = new HashMap();
+            lastModified = new HashMap<String, String>();
        }
        try {
            lastFetched = ConfigParser.parse(lastFetchedFile);
        } catch (IOException exp) {
-            lastFetched = new HashMap();
+            lastFetched = new HashMap<String, String>();
        }
        for (String location : locations) {
            this.subscriptions.add(new Subscription(location, etags.get(location),
@@ -121,9 +121,9 @@ class SubscriptionList {
     * won't be read back correctly; the '=' should be escaped.
     */
    public void write() {
-        Map<String, String> etags = new HashMap();
-        Map<String, String>  lastModified = new HashMap();
-        Map<String, String>  lastFetched = new HashMap();
+        Map<String, String> etags = new HashMap<String, String>();
+        Map<String, String>  lastModified = new HashMap<String, String>();
+        Map<String, String>  lastFetched = new HashMap<String, String>();
        for (Subscription sub : this.subscriptions) {
            if (sub.getEtag() != null) {
                etags.put(sub.getLocation(), sub.getEtag());
--- a/apps/addressbook/java/src/net/i2p/addressbook/package.html
+++ b/apps/addressbook/java/src/net/i2p/addressbook/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+The addressbook application, which fetches hosts.txt files from subscription URLS via
+HTTP and adds new hosts to the local database.
+While implemented as a webapp, this application contains no user interface.
+May also be packaged as a jar, as is done for Android.
+The webapp named 'addressbook' in the console is actually SusiDNS.
+</p>
+</body>
+</html>
--- a/apps/addressbook/web.xml
+++ b/apps/addressbook/web.xml
@@ -4,6 +4,15 @@
    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">

 <web-app>
+    <filter>
+        <filter-name>XSSFilter</filter-name>
+        <filter-class>net.i2p.servlet.filters.XSSFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>XSSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
 	<servlet>
 		<servlet-name>addressbook</servlet-name>
 		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
@@ -19,4 +28,11 @@
      <url-pattern>/*</url-pattern>
    </servlet-mapping>

+    <!-- this webapp doesn't actually use sessions or cookies -->
+    <session-config>
+        <session-timeout>30</session-timeout>
+        <cookie-config>
+            <http-only>true</http-only>
+        </cookie-config>
+    </session-config>
 </web-app>
--- a/apps/admin/java/src/net/i2p/router/admin/AdminRunner.java
+++ b/apps/admin/java/src/net/i2p/router/admin/AdminRunner.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.Set;

 import net.i2p.data.Hash;
+import net.i2p.data.DataHelper
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
@@ -47,7 +48,7 @@ class AdminRunner implements Runnable {
            reply(out, "this is not a website");
        } else if ( (command.indexOf("routerStats.html") >= 0) || (command.indexOf("oldstats.jsp") >= 0) ) {
            try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
+                out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
                _generator.generateStatsPage(new OutputStreamWriter(out));
                out.close();
            } catch (IOException ioe) {
@@ -61,7 +62,7 @@ class AdminRunner implements Runnable {
            reply(out, shutdown(command));
        } else if (true || command.indexOf("routerConsole.html") > 0) {
            try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
+                out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
                _context.router().renderStatusHTML(new OutputStreamWriter(out));
                out.close();
            } catch (IOException ioe) {
@@ -80,7 +81,7 @@ class AdminRunner implements Runnable {
        reply.append("Content-type: text/html\n\n");
        reply.append(content);
        try {
-            out.write(reply.toString().getBytes());
+            out.write(DataHelper.getASCII(reply.toString()));
            out.close();
        } catch (IOException ioe) {
            if (_log.shouldLog(Log.WARN))
@@ -97,7 +98,7 @@ class AdminRunner implements Runnable {
        reply.append("Content-type: text/plain\n\n");
        reply.append(content);
        try {
-            out.write(reply.toString().getBytes());
+            out.write(DataHelper.getASCII(reply.toString()));
            out.close();
        } catch (IOException ioe) {
            if (_log.shouldLog(Log.WARN))
--- a/apps/apparmor/home.i2p.i2prouter
+++ b/apps/apparmor/home.i2p.i2prouter
@@ -0,0 +1,99 @@
+#Last Modified: Sun Dec 06 12:30:32 2015
+# vim:syntax=apparmor et ts=8 sw=4
+
+#include <tunables/global>
+
+$INSTALL_PATH/{i2prouter,runplain.sh} flags=(complain) {
+  #include <abstractions/base>
+  #include <abstractions/fonts>
+  #include <abstractions/nameservice>
+  #include <abstractions/ssl_certs>
+
+  capability sys_ptrace,
+  network inet stream,
+  network inet6 stream,
+
+  $INSTALL_PATH/                                          r,
+  $INSTALL_PATH/{i2psvc,wrapper}                          rmix,
+  owner $INSTALL_PATH/**                                  rwkm,
+
+  # Needed for Java
+  owner @{PROC}                                           r,
+  owner @{PROC}/[0-9]*/                                   r,
+  owner @{PROC}/[0-9]*/status                             r,
+  owner @{PROC}/[0-9]*/stat                               r,
+  owner @{PROC}/[0-9]*/cmdline                            r,
+  @{PROC}/uptime                                          r,
+  @{PROC}/sys/kernel/pid_max                              r,
+  /sys/devices/system/cpu/                                r,
+  /sys/devices/system/cpu/**                              r,
+
+  /dev/random                                             r,
+  /dev/urandom                                            r,
+
+  @{PROC}/1/comm                                          r,
+
+  /etc/ssl/certs/java/**                                  r,
+  /etc/timezone                                           r,
+  /usr/share/javazi/**                                    r,
+
+  # Debian
+  /etc/java-{6,7,8}-openjdk/**                            r,
+  /usr/lib/jvm/default-java/jre/bin/java                  rix,
+
+  # Debian, Ubuntu, openSUSE
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/java      rix,
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/keytool   rix,
+
+  # Raspbian
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/java                rix,
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/keytool             rix,
+
+
+  # Fonts are needed for I2P's graphs
+  /usr/share/java/java-atk-wrapper.jar                    r,
+
+  # Used by some plugins
+  /usr/share/java/eclipse-ecj-*.jar                       r,
+
+  /{,var/}tmp/                                            rwm,
+  owner /{,var/}tmp/**                                    rwkm,
+
+  /{,usr/}bin/{,b,d}ash                                   rix,
+  /{,usr/}bin/cat                                         rix,
+  /{,usr/}bin/cut                                         rix,
+  /{,usr/}bin/dirname                                     rix,
+  /{,usr/}bin/expr                                        rix,
+  /{,usr/}bin/{,g,m}awk                                   rix,
+  /{,usr/}bin/grep                                        rix,
+  /{,usr/}bin/id                                          rix,
+  /{,usr/}bin/ldd                                         rix,
+  /{,usr/}bin/ls                                          rix,
+  /{,usr/}bin/mkdir                                       rix,
+  /{,usr/}bin/nohup                                       rix,
+  /{,usr/}bin/ps                                          rix,
+  /{,usr/}bin/rm                                          rix,
+  /{,usr/}bin/sed                                         rix,
+  /{,usr/}bin/sleep                                       rix,
+  /{,usr/}bin/tail                                        rix,
+  /{,usr/}bin/tr                                          rix,
+  /{,usr/}bin/uname                                       rix,
+  /{,usr/}bin/which                                       rix,
+
+  @{HOME}/.java/fonts/**                                  r,
+  owner  @{HOME}/.i2p/                                    rw,
+  owner  @{HOME}/.i2p/**                                  rwk,
+
+  # Prevent spamming the logs
+  deny owner @{HOME}/.java/                               wk,
+  deny @{HOME}/.fontconfig/                               wk,
+  deny @{HOME}/.java/fonts/**                             w,
+  deny /dev/tty                                           rw,
+  deny /dev/pts/[0-9]*                                    rw,
+  deny @{PROC}/[0-9]*/fd/                                 r,
+  deny /usr/local/share/fonts/                            r,
+  deny /var/cache/fontconfig/                             wk,
+  # Used by some versions of the Tanuki wrapper but never used by I2P
+  deny /usr/share/java/hamcrest*.jar                      r,
+  deny /usr/share/java/junit*.jar                         r,
+}
--- a/apps/desktopgui/.classpath
+++ b/apps/desktopgui/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/apps/desktopgui/.project
+++ b/apps/desktopgui/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>desktopgui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -7,13 +7,17 @@
 	<property name="jar" value="desktopgui.jar"/>
 	<property name="resources" value="resources"/>
    <property name="javadoc" value="javadoc"/>
-
 	<property name="javac.compilerargs" value=""/>
+	<property name="javac.version" value="1.6" />
 	<property name="require.gettext" value="true" />

+    <condition property="no.bundle">
+        <isfalse value="${require.gettext}" />
+    </condition>
+
 	<target name="init">
-		<mkdir dir="${build}"/>
-        <mkdir dir="${build}/${resources}"/>
+	<mkdir dir="${build}"/>
+	<mkdir dir="${build}/${resources}"/>
        <mkdir dir="${build}/${javadoc}"/>
 		<mkdir dir="${dist}"/>
 	</target>
@@ -24,7 +28,7 @@
 	</target>

 	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                       includeAntRuntime="false"
                       srcdir="${src}" destdir="${build}">
            <compilerarg line="${javac.compilerargs}" />
@@ -39,8 +43,9 @@
        </copy>
 	</target>

-	<target name="bundle" >
+	<target name="bundle" unless="no.bundle">
        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
            <arg value="./bundle-messages.sh" />
        </exec>
        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Update messages_xx.po and messages_xx.class files,
 # from both java and jsp sources.
@@ -15,18 +16,22 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0

+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1
 fi

 # on windows, one must specify the path of commnad find
-# since windows has its own retarded version of find.
+# since windows has its own version of find.
 if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this

 # add ../java/ so the refs will work in the po file
 JPATHS="src"
@@ -59,19 +64,19 @@ do
 	 	echo "Updating the $i file from the tags..."
 		# extract strings from java and jsp files, and update messages.po files
 		# translate calls must be one of the forms:
-		# _("foo")
+		# _t("foo")
 		# _x("foo")
-		# intl._("foo")
+		# intl._t("foo")
 		# intl.title("foo")
-		# handler._("foo")
-		# formhandler._("foo")
+		# handler._t("foo")
+		# formhandler._t("foo")
 		# net.i2p.router.web.Messages.getString("foo")
 		# In a jsp, you must use a helper or handler that has the context set.
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean updater.
 		find $JPATHS -name *.java > $TMPFILE
 		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
-	                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
+	                 --keyword=_t --keyword=_x --keyword=intl._ --keyword=intl.title \
 	                 --keyword=handler._ --keyword=formhandler._ \
 	                 --keyword=net.i2p.router.web.Messages.getString \
 		         -o ${i}t
--- a/apps/desktopgui/locale/messages_ar.po
+++ b/apps/desktopgui/locale/messages_ar.po
@@ -11,6 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2011-02-20 11:53+0000\n"
 "PO-Revision-Date: 2011-02-26 19:46-0000\n"
 "Last-Translator: hamada <hamada@mail.i2p>\n"
+"Language: ar\n"
 "Language-Team: duck <duck@mail.i2p>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/apps/desktopgui/locale/messages_da.po
+++ b/apps/desktopgui/locale/messages_da.po
@@ -3,20 +3,22 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <kia___@hushmail.com>, 2011.
+# Translators:
+# Aesthese, 2016
+# KIA <kia___@hushmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-07-12 19:41+0000\n"
-"Last-Translator: KIA <kia___@hushmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/I2P/team/da/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2016-01-08 07:54+0000\n"
+"Last-Translator: Aesthese\n"
+"Language-Team: Danish (http://www.transifex.com/otf/I2P/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -24,7 +26,7 @@ msgstr "Start I2P"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "I2P is starting!"
-msgstr "I2P starter nu!"
+msgstr "I2P starter!"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "Starting"
@@ -46,12 +48,10 @@ msgstr "Genstart I2P"
 msgid "Stop I2P"
 msgstr "Stop I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Konfiguration af processbar ikonet"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Skal processbar ikonet være aktivt?"
-
-
--- a/apps/desktopgui/locale/messages_de.po
+++ b/apps/desktopgui/locale/messages_de.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # foo <foo@bar>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 18:07+0000\n"
 "PO-Revision-Date: 2011-03-22 15:49+0000\n"
 "Last-Translator: blabla <blabla@trash-mail.com>\n"
 "Language-Team: German <>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
@@ -46,10 +46,10 @@ msgstr "I2P neustarten"
 msgid "Stop I2P"
 msgstr "I2P beenden"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Systemleistensymbol konfigurieren"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Systemleistensymbol aktivieren?"
--- a/apps/desktopgui/locale/messages_el.po
+++ b/apps/desktopgui/locale/messages_el.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+#   <lixtetrax@grhack.net>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-07-02 11:28+0000\n"
+"Last-Translator: lixtetrax <lixtetrax@grhack.net>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Έναρξη Ι2Ρ"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Το Ι2Ρ ξεκίνησε!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Έναρξη"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Έναρξη φυλλομετρητή Ι2Ρ"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Παραμετροποίηση desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Επανεκκίνηση Ι2Ρ"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Τερματισμός Ι2Ρ"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Παραμετροποίηση εικονιδίου"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Ενεργοποίηση εικονιδίου;"
--- a/apps/desktopgui/locale/messages_en.po
+++ b/apps/desktopgui/locale/messages_en.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P desktopgui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,10 +46,10 @@ msgstr ""
 msgid "Stop I2P"
 msgstr ""

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr ""

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr ""
--- a/apps/desktopgui/locale/messages_fr.po
+++ b/apps/desktopgui/locale/messages_fr.po
@@ -2,21 +2,26 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
 #
+# Translators:
+# blabla <blabla@trash-mail.com>, 2011
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Boxoa590, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-03-30 21:58+0100\n"
-"Last-Translator: magma <magma@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-01-09 19:14+0000\n"
+"PO-Revision-Date: 2013-06-08 04:50+0000\n"
+"Last-Translator: Boxoa590\n"
+"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -24,7 +29,7 @@ msgstr "Démarrer I2P"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "I2P is starting!"
-msgstr "I2P démarre!"
+msgstr "I2P démarre !"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "Starting"
@@ -32,7 +37,7 @@ msgstr "Démarrage"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Lancer le navigateur"
+msgstr "Lancer le navigateur I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -46,11 +51,10 @@ msgstr "Redémarrer I2P"
 msgid "Stop I2P"
 msgstr "Arrêter I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Configuration de l'icône de notification"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
-msgstr "Activer l'icône de notification"
-
+msgstr "Activer l'icône de notification ?"
--- a/apps/desktopgui/locale/messages_hu.po
+++ b/apps/desktopgui/locale/messages_hu.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-06-01 16:28+0000\n"
+"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
+"Language-Team: Hungarian (http://www.transifex.net/projects/p/I2P/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P indítása"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P indul!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "indítás"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P Böngésző Indítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Asztali Grafikus Felület Beállítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P Újraindítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P Leállítása"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Tálcaikon beállítása"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Tálcaikon engedélyezve legyen?"
--- a/apps/desktopgui/locale/messages_it.po
+++ b/apps/desktopgui/locale/messages_it.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
+# Translators:
+#   <bovas85@gmail.com>, 2012.
 #   <jokjok@hotmail.it>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
 "POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-06-09 17:09+0000\n"
-"Last-Translator: mkkid <jokjok@hotmail.it>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/team/it/)\n"
+"PO-Revision-Date: 2012-06-01 12:21+0000\n"
+"Last-Translator: Leelium <bovas85@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,10 +50,8 @@ msgstr "Ferma I2P"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
 msgid "Tray icon configuration"
-msgstr "Configurazione dell'icona nell'Area di notifica"
+msgstr "Configurazione dell'icona nell'area di notifica"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "Vuoi che l'icona nell'Area di notifica venga abilitata?"
-
-
+msgstr "Vuoi che l'icona nelll'rea di notifica venga abilitata?"
--- a/apps/desktopgui/locale/messages_ja.po
+++ b/apps/desktopgui/locale/messages_ja.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# plazmism <gomidori@live.jp>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-11-26 10:38+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P を開始"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P 起動中！"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "起動中"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P ブラウザを起動"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "desktopgui を設定"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P を再起動"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P を停止"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "トレイアイコン設定"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "トレイアイコンを有効にしますか？"
--- a/apps/desktopgui/locale/messages_pl.po
+++ b/apps/desktopgui/locale/messages_pl.po
@@ -3,20 +3,22 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <b790979@klzlk.com>, 2011.
+# Translators:
+# PolishAnon <b790979@klzlk.com>, 2011
+# polacco <polacco@i2pmail.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-05-25 18:36+0000\n"
-"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2015-02-17 20:54+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +34,7 @@ msgstr "Uruchamianie"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Uruchom Przeglądarke I2P"
+msgstr "Uruchom przeglądarkę I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -46,12 +48,10 @@ msgstr "Zrestartuj I2P"
 msgid "Stop I2P"
 msgstr "Zatrzymaj I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Konfiguracja ikony zasobnika"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Czy ikona zasobnika powinna być aktywna?"
-
-
--- a/apps/desktopgui/locale/messages_pt_BR.po
+++ b/apps/desktopgui/locale/messages_pt_BR.po
@@ -0,0 +1,58 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# testsubject67 <deborinha97@hotmail.com>, 2014
+# blueboy, 2013
+# blueboy, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2015-12-23 00:12+0000\n"
+"Last-Translator: blueboy\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/I2P/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Conectar-se à I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Conectando-se a I2P!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Conectando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lançar o navegador I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurar desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Reinicializar o roteador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Interromper o roteador I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Configuração do ícone de bandeja"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Ativar ícone de bandeja?"
--- a/apps/desktopgui/locale/messages_ro.po
+++ b/apps/desktopgui/locale/messages_ro.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:03+0000\n"
+"PO-Revision-Date: 2013-11-11 11:31+0000\n"
+"Last-Translator: polearnik <polearnik@mail.ru>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/"
+"ro/)\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Start I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P se pornește!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Începere"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lansare I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurarea desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Restart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stop I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Configurare pictogramei din bara de sistem"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Ar trebui să fie activata pictograma din bara de sistem?"
--- a/apps/desktopgui/locale/messages_ru.po
+++ b/apps/desktopgui/locale/messages_ru.po
@@ -2,21 +2,24 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Роман Азаренко <transifex@basicxp.ru>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-19 17:26+0000\n"
-"PO-Revision-Date: 2011-02-23 10:23+0500\n"
-"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-12-04 11:46+0000\n"
+"Last-Translator: Bergitte <alvina_alexandrova@mail.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +35,7 @@ msgstr "Запускается"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Запустить I2P браузер"
+msgstr "Запустить браузер I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -48,9 +51,8 @@ msgstr "Остановить I2P"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
 msgid "Tray icon configuration"
-msgstr "Настройка иконки в трее"
+msgstr "Конфигурация значка в области уведомлений"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "Отображать ли иконку в трее?"
-
+msgstr "Отображать ли значок в области уведомлений?"
--- a/apps/desktopgui/locale/messages_sk.po
+++ b/apps/desktopgui/locale/messages_sk.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Krantišek <jaksrn@gmail.com>, 2014
+# Svistwarrior273 <romanbeno273@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2014-04-20 09:56+0000\n"
+"Last-Translator: Svistwarrior273 <romanbeno273@gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Spustiť I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P sa spúšťa!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Spúšťa sa"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Spustiť I2P prehliadač"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Nakonfigurovať desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Reštartovať I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zastaviť I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Konfigurácia ikony v lište"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Mala by byť ikona v lište povolená?"
--- a/apps/desktopgui/locale/messages_tr.po
+++ b/apps/desktopgui/locale/messages_tr.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Kaya Zeren <kayazeren@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-04-26 06:07+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P başlasın"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P başlatılıyor!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Başlatılıyor"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P Tarayıcısını Açın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Masaüstü Arayüzünü Ayarlayın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P Yeniden Başlasın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P Durdurulsun"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Sistem tepsisi simgesi ayarı"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Sistem tepsisi simgesi kullanılsın"
--- a/apps/desktopgui/locale/messages_uk.po
+++ b/apps/desktopgui/locale/messages_uk.po
@@ -3,20 +3,23 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <gribua@gmail.com>, 2011.
+# Translators:
+# Denis Lysenko <gribua@gmail.com>, 2011
+# LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-06-19 14:01+0000\n"
-"Last-Translator: Pharmasolin <gribua@gmail.com>\n"
-"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2015-08-07 16:31+0000\n"
+"Last-Translator: Denis Lysenko <gribua@gmail.com>\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk_UA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -46,12 +49,10 @@ msgstr "Перезапустити I2P"
 msgid "Stop I2P"
 msgstr "Зупинити I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
-msgstr "Настройка трей-іконки"
+msgstr "Налаштування трей-іконки"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
-msgstr "Чм повинна трей-іконка бути включена?"
-
-
+msgstr "Чи повинна трей-іконка бути включена?"
--- a/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java
@@ -20,7 +20,7 @@ public class ExternalTrayManager extends TrayManager {
    @Override
    public PopupMenu getMainMenu() {
        PopupMenu popup = new PopupMenu();
-        MenuItem startItem = new MenuItem(_("Start I2P"));
+        MenuItem startItem = new MenuItem(_t("Start I2P"));
        startItem.addActionListener(new ActionListener() {

            @Override
@@ -35,7 +35,7 @@ public class ExternalTrayManager extends TrayManager {
                    
                    @Override
                    protected void done() {
-                        trayIcon.displayMessage(_("Starting"), _("I2P is starting!"), TrayIcon.MessageType.INFO);
+                        trayIcon.displayMessage(_t("Starting"), _t("I2P is starting!"), TrayIcon.MessageType.INFO);
                        //Hide the tray icon.
                        //We cannot stop the desktopgui program entirely,
                        //since that risks killing the I2P process as well.
--- a/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
@@ -23,7 +23,7 @@ public class InternalTrayManager extends TrayManager {
    public PopupMenu getMainMenu() {
        PopupMenu popup = new PopupMenu();
        
-        MenuItem browserLauncher = new MenuItem(_("Launch I2P Browser"));
+        MenuItem browserLauncher = new MenuItem(_t("Launch I2P Browser"));
        browserLauncher.addActionListener(new ActionListener() {
            
            @Override
@@ -47,7 +47,7 @@ public class InternalTrayManager extends TrayManager {
                }.execute();
            }
        });
-        MenuItem desktopguiConfigurationLauncher = new MenuItem(_("Configure desktopgui"));
+        MenuItem desktopguiConfigurationLauncher = new MenuItem(_t("Configure desktopgui"));
        desktopguiConfigurationLauncher.addActionListener(new ActionListener() {

            @Override
@@ -64,7 +64,7 @@ public class InternalTrayManager extends TrayManager {
            }

        });
-        MenuItem restartItem = new MenuItem(_("Restart I2P"));
+        MenuItem restartItem = new MenuItem(_t("Restart I2P"));
        restartItem.addActionListener(new ActionListener() {

            @Override
@@ -82,7 +82,7 @@ public class InternalTrayManager extends TrayManager {
            }
            
        });
-        MenuItem stopItem = new MenuItem(_("Stop I2P"));
+        MenuItem stopItem = new MenuItem(_t("Stop I2P"));
        stopItem.addActionListener(new ActionListener() {

            @Override
--- a/apps/desktopgui/src/net/i2p/desktopgui/Main.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/Main.java
@@ -7,9 +7,6 @@ package net.i2p.desktopgui;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import java.awt.GraphicsEnvironment;
-
-import net.i2p.I2PAppContext;
 import net.i2p.desktopgui.router.RouterManager;
 import net.i2p.desktopgui.util.*;
 import net.i2p.util.Log;
--- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
@@ -1,28 +1,15 @@
 package net.i2p.desktopgui;

 import java.awt.AWTException;
-import java.awt.Desktop;
 import java.awt.Image;
-import java.awt.MenuItem;
 import java.awt.PopupMenu;
 import java.awt.SystemTray;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
-import java.awt.Desktop.Action;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;

-import javax.swing.SwingWorker;
-
 import net.i2p.desktopgui.i18n.DesktopguiTranslator;
 import net.i2p.desktopgui.router.RouterManager;
-import net.i2p.desktopgui.util.BrowseException;
-import net.i2p.desktopgui.util.ConfigurationManager;
-import net.i2p.desktopgui.util.I2PDesktop;
 import net.i2p.util.Log;

 /**
@@ -91,7 +78,7 @@ public abstract class TrayManager {
        return image;
    }
    
-    protected static String _(String s) {
-        return DesktopguiTranslator._(s);
+    protected static String _t(String s) {
+        return DesktopguiTranslator._t(s);
    }
 }
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
@@ -32,7 +32,6 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
-    @SuppressWarnings("unchecked")
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {

@@ -41,10 +40,10 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
        cancelButton = new javax.swing.JButton();

        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        setTitle(_("Tray icon configuration"));
+        setTitle(_t("Tray icon configuration"));

        desktopguiEnabled.setSelected(true);
-        desktopguiEnabled.setText(_("Should tray icon be enabled?"));
+        desktopguiEnabled.setText(_t("Should tray icon be enabled?"));
        desktopguiEnabled.setActionCommand("shouldDesktopguiBeEnabled");

        okButton.setText("OK");
@@ -99,8 +98,8 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
        configureDesktopgui();
    }//GEN-LAST:event_okButtonMouseReleased

-    protected static String _(String s) {
-        return DesktopguiTranslator._(s);
+    protected static String _t(String s) {
+        return DesktopguiTranslator._t(s);
    }

    private void configureDesktopgui() {
@@ -115,7 +114,7 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
            System.out.println("Enabling desktopgui");
        }
        try {
-            RouterManager.getRouterContext().setProperty(property, value);
+            RouterManager.getRouterContext().router().saveConfig(property, value);
        } catch (Exception ex) {
            Logger.getLogger(DesktopguiConfigurationFrame.class.getName()).log(Level.SEVERE, null, ex);
        }
--- a/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java
@@ -16,11 +16,11 @@ public class DesktopguiTranslator {
        return ctx;
    }
    
-    public static String _(String s) {
+    public static String _t(String s) {
        return Translate.getString(s, getRouterContext(), BUNDLE_NAME);
    }

-    public static String _(String s, Object o) {
+    public static String _t(String s, Object o) {
        return Translate.getString(s, o, getRouterContext(), BUNDLE_NAME);
    }
 }
--- a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
@@ -5,8 +5,6 @@ import java.io.IOException;
 import org.tanukisoftware.wrapper.WrapperManager;

 import net.i2p.I2PAppContext;
-import net.i2p.desktopgui.i18n.DesktopguiTranslator;
-import net.i2p.desktopgui.util.ConfigurationManager;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
--- a/apps/desktopgui/src/net/i2p/desktopgui/util/ConfigurationManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/util/ConfigurationManager.java
@@ -78,7 +78,7 @@ public class ConfigurationManager {
 	 * @return The value of a configuration: true if found, defaultValue if not found.
 	 */
 	public boolean getBooleanConfiguration(String arg, boolean defaultValue) {
-		Boolean value = ((Boolean) booleanConfigurations.get("startWithI2P"));
+		Boolean value = booleanConfigurations.get("startWithI2P");
 		System.out.println(value);
 		if(value != null) {
 			return value;
--- a/apps/desktopgui/src/net/i2p/desktopgui/util/I2PDesktop.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/util/I2PDesktop.java
@@ -1,13 +1,8 @@
 package net.i2p.desktopgui.util;

 import java.awt.Desktop;
-import java.awt.TrayIcon;
 import java.awt.Desktop.Action;
-import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
-
-import net.i2p.desktopgui.router.RouterManager;
 import net.i2p.util.Log;

 public class I2PDesktop {
--- a/apps/fortuna/build.xml
+++ b/apps/fortuna/build.xml
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="fortuna">
-
-	<property name="cvs.base.dir" value="java/gnu-crypto" />
-	<property name="cvs.etc.dir" value="${cvs.base.dir}/etc" />
-	<property name="cvs.lib.dir" value="${cvs.base.dir}/lib" />
-	<property name="cvs.object.dir" value="${cvs.base.dir}/classes" />
-	<property name="cvs.base.crypto.object.dir" value="${cvs.object.dir}/gnu/crypto" />
-	<property name="cvs.cipher.object.dir" value="${cvs.base.crypto.object.dir}/cipher" />
-	<property name="cvs.hash.object.dir" value="${cvs.base.crypto.object.dir}/hash" />
-	<property name="cvs.prng.object.dir" value="${cvs.base.crypto.object.dir}/prng" />
-
-	<patternset id="fortuna.files">
-		<include name="${cvs.base.crypto.object.dir}/Registry.class"/>
-		<include name="${cvs.prng.object.dir}/Fortuna*.class"/>
-		<include name="${cvs.prng.object.dir}/BasePRNG.class"/>
-		<include name="${cvs.prng.object.dir}/RandomEventListener.class"/>
-		<include name="${cvs.prng.object.dir}/IRandom.class"/>
-		<include name="${cvs.cipher.object.dir}/CipherFactory.class"/>
-		<include name="${cvs.cipher.object.dir}/IBlockCipher.class"/>
-		<include name="${cvs.hash.object.dir}/HashFactory.class"/>
-		<include name="${cvs.hash.object.dir}/IMessageDigest.class"/>
-	</patternset>
-
-	<target name="all" depends="build,jar" 
-		description="Create and test the custom Fortuna library" />
-
-	<target name="build" depends="-init,checkout"
-		description="Build the source and tests">
-		<ant dir="${cvs.base.dir}" target="jar" />
-	</target>
-
-	<target name="builddep" />
-
-	<target name="checkout" depends="-init" unless="cvs.source.available"
-		description="Check out GNU Crypto sources from CVS HEAD">
-		<cvs cvsRoot=":ext:anoncvs@savannah.gnu.org:/cvsroot/gnu-crypto"
-			cvsRsh="ssh"
-			dest="java"
-			package="gnu-crypto" />
-	</target>
-
-	<target name="clean"
-		description="Remove generated tests and object files">
-		<ant dir="${cvs.base.dir}" target="clean" />
-	</target>
-
-	<target name="cleandep" />
-
-	<target name="compile" />
-
-	<target name="distclean" depends="clean"
-		description="Remove all generated files">
-		<delete dir="build" />
-		<delete dir="jartemp" />
-		<!--
-			Annoyingly the GNU Crypto distclean task called here doesn't clean
-			*all* derived files from java/gnu-crypto/lib like it should.....
-		-->
-		<ant dir="${cvs.base.dir}" target="distclean" />
-		<!--
-			.....and so we mop up the rest ourselves.
-		-->
-		<delete dir="${cvs.lib.dir}" />
-	</target>
-
-	<target name="-init">
-		<available property="cvs.source.available" file="${cvs.base.dir}" />
-	</target>
-
-	<target name="jar" depends="build"
-		description="Create the custom Fortuna jar library">
-		<delete dir="build" />
-		<delete dir="jartemp" />
-		<mkdir dir="build" />
-		<mkdir dir="jartemp/${cvs.object.dir}" />
-		<copy todir="jartemp">
-			<fileset dir=".">
-				<patternset refid="fortuna.files" />
-			</fileset>
-		</copy>
-		<jar basedir="jartemp/${cvs.object.dir}" jarfile="build/fortuna.jar">
-			<manifest>
-				<section name="fortuna">
-					<attribute name="Implementation-Title" value="I2P Custom GNU Crypto Fortuna Library" />
-					<attribute name="Implementation-Version" value="CVS HEAD" /> 
-					<attribute name="Implementation-Vendor" value="Free Software Foundation" />
-					<attribute name="Implementation-Vendor-Id" value="FSF" />
-					<attribute name="Implementation-URL" value="http://www.gnu.org/software/gnu-crypto" />
-				</section>
-			</manifest>
-		</jar>
-		<delete dir="jartemp" />
-	</target>
-
-	<target name="test" depends="jar"
-		description="Perform crypto tests on custom Fortuna jar library" />
-		<!--
-			Add this when Fortuna tests are added to GNU Crypto, else write some
-		-->
-
-	<target name="update" depends="checkout"
-		description="Update GNU Crypto sources to latest CVS HEAD">
-		<cvs command="update -d" cvsRsh="ssh" dest="java/gnu-crypto" />
-	</target>
-</project>
--- a/apps/i2psnark/.classpath
+++ b/apps/i2psnark/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="java/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
+	<classpathentry kind="output" path="java/build/obj"/>
+</classpath>
--- a/apps/i2psnark/.project
+++ b/apps/i2psnark/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>i2psnark</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/i2psnark/COPYING
+++ b/apps/i2psnark/COPYING
@@ -1,340 +1 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+See ../../licenses/LICENSE-GPLv2.txt
--- a/apps/i2psnark/TODO
+++ b/apps/i2psnark/TODO
@@ -1,24 +0,0 @@
- I2PSnark:
-  - add multitorrent support by checking the metainfo hash in the
-    PeerAcceptor and feeding it off to the appropriate coordinator
-  - add a web interface
-
- BEncode
-  - Byte array length indicator can overflow.
-  - Support really big BigNums (only 256 chars allowed now)
-  - Better BEValue toString(). Uses stupid heuristic now for debugging.
-  - Implemented bencoding.
-  - Remove application level hack to calculate sha1 hash for metainfo
-    (But can it be done as efficiently?)
-
- Storage
-  - Check file name filter.
-
- TrackerClient
-  - Support undocumented &numwant= request.
-
- PeerCoordinator
-  - Disconnect from other seeds as soon as you are a seed yourself.
-
- Text UI
-  - Make it completely silent.
--- a/apps/i2psnark/authors-snark.txt
+++ b/apps/i2psnark/authors-snark.txt
--- a/apps/i2psnark/changelog-snark.txt
+++ b/apps/i2psnark/changelog-snark.txt
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -17,25 +17,28 @@
            <classpath>
                <pathelement location="../../../core/java/build/obj" />
                <pathelement location="../../ministreaming/java/build/obj" />
-                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
            </classpath>
        </depend>
    </target>

    <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
    <property name="require.gettext" value="true" />

+    <condition property="no.bundle">
+        <isfalse value="${require.gettext}" />
+    </condition>
+
    <target name="compile" depends="depend">
        <mkdir dir="./build" />
        <mkdir dir="./build/obj" />
        <javac 
            srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
            destdir="./build/obj" 
            includeAntRuntime="false"
-            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
+            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
            <compilerarg line="${javac.compilerargs}" />
        </javac>
    </target>
@@ -57,7 +60,7 @@
    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
        <!-- set if unset -->
        <property name="workspace.changes.tr" value="" />
-        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
+        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/web/* **/messages_*.class">
            <manifest>
                <attribute name="Main-Class" value="org.klomp.snark.Snark" />
                <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
@@ -72,7 +75,7 @@
    
    <target name="jarUpToDate">
        <uptodate property="jar.uptodate" targetfile="build/i2psnark.jar" >
-            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class" />
+            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/web/* **/messages_*.class" />
        </uptodate>
        <condition property="shouldListChanges" >
            <and>
@@ -80,7 +83,7 @@
                    <isset property="jar.uptodate" />
                </not>
                <not>
-                    <isset property="wjar.uptodate" />
+                    <isset property="war.uptodate" />
                </not>
                <isset property="mtn.available" />
            </and>
@@ -97,13 +100,15 @@
    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" > 
        <!-- set if unset -->
        <property name="workspace.changes.tr" value="" />
-        <copy todir="build/icons/.icons" >
-            <fileset dir="../icons/" />
+        <copy todir="build/resources/.resources" >
+            <fileset dir="../resources/" />
        </copy>
+        <!-- mime.properties must be in with the classes -->
+        <copy file="../mime.properties" todir="build/obj/org/klomp/snark/web" />
        <war destfile="../i2psnark.war" webxml="../web.xml" >
          <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
-          <classes dir="./build/obj" includes="**/web/*.class" />
-            <fileset dir="build/icons/" />
+          <classes dir="./build/obj" includes="**/web/*" />
+            <fileset dir="build/resources/" />
            <manifest>
                <attribute name="Implementation-Version" value="${full.version}" />
                <attribute name="Built-By" value="${build.built-by}" />
@@ -116,14 +121,15 @@
    
    <target name="warUpToDate">
        <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
-            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../icons/* ../web.xml" />
+            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../resources/**/* ../web.xml" />
        </uptodate>
    </target>
    
-    <target name="bundle" depends="compile">
+    <target name="bundle" depends="compile" unless="no.bundle">
        <!-- Update the messages_*.po files.
             We need to supply the bat file for windows, and then change the fail property to true -->
        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
            <arg value="./bundle-messages.sh" />
        </exec>
        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
@@ -169,7 +175,6 @@
        <copy file="../../jetty/jettylib/commons-logging.jar" tofile="./dist/lib/commons-logging.jar" />
        <copy file="../../jetty/jettylib/javax.servlet.jar" tofile="./dist/lib/javax.servlet.jar" />
        <copy file="../../jetty/jettylib/org.mortbay.jetty.jar" tofile="./dist/lib/org.mortbay.jetty.jar" />
-        <copy file="../../jetty/jettylib/jasper-compiler.jar" tofile="./dist/lib/jasper-compiler.jar" />
        <copy file="../../jetty/jettylib/jasper-runtime.jar" tofile="./dist/lib/jasper-runtime.jar" />
        <copy file="../../ministreaming/java/build/mstreaming.jar" tofile="./dist/lib/mstreaming.jar" />
        <copy file="../../streaming/java/build/streaming.jar" tofile="./dist/lib/streaming.jar" />
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Update messages_xx.po and messages_xx.class files,
 # from both java and jsp sources.
@@ -14,18 +15,22 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0

+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1
 fi

 # on windows, one must specify the path of commnad find
-# since windows has its own retarded version of find.
+# since windows has its own version of find.
 if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this

 # add ../java/ so the refs will work in the po file
 JPATHS="../java/src"
@@ -58,13 +63,13 @@ do
 	 	echo "Updating the $i file from the tags..."
 		# extract strings from java and jsp files, and update messages.po files
 		# translate calls must be one of the forms:
-		# _("foo")
+		# _t("foo")
 		# _x("foo")
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean poupdate.
 		find $JPATHS -name *.java > $TMPFILE
 		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
-	                 --keyword=_ --keyword=_x \
+	                 --keyword=_t --keyword=_x \
 		         -o ${i}t
 		if [ $? -ne 0 ]
 		then
--- a/apps/i2psnark/java/src/org/klomp/snark/BWLimits.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/BWLimits.java
@@ -4,7 +4,6 @@
 */
 package org.klomp.snark;

-import java.util.Arrays;
 import java.util.Properties;

 import net.i2p.client.I2PSessionException;
@@ -37,7 +36,9 @@ class BWLimits {
        return rv;
    }

+/****
    public static void main(String args[]) {
        System.out.println(Arrays.toString(getBWLimits("127.0.0.1", 7654)));
    }
+****/
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/BitField.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/BitField.java
@@ -20,6 +20,8 @@

 package org.klomp.snark;

+import java.util.Arrays;
+

 /**
 * Container of a byte array representing set and unset bits.
@@ -39,7 +41,6 @@ public class BitField
    this.size = size;
    int arraysize = ((size-1)/8)+1;
    bitfield = new byte[arraysize];
-    this.count = 0;
  }

  /**
@@ -60,7 +61,6 @@ public class BitField
    // cleared or clear them explicitly ourselves.
    System.arraycopy(bitfield, 0, this.bitfield, 0, arraysize);

-    this.count = 0;
    for (int i = 0; i < size; i++)
      if (get(i))
        this.count++;
@@ -68,7 +68,7 @@ public class BitField

  /**
   * This returns the actual byte array used.  Changes to this array
-   * effect this BitField.  Note that some bits at the end of the byte
+   * affect this BitField.  Note that some bits at the end of the byte
   * array are supposed to be always unset if they represent bits
   * bigger then the size of the bitfield.
   */
@@ -99,12 +99,45 @@ public class BitField
      throw new IndexOutOfBoundsException(Integer.toString(bit));
    int index = bit/8;
    int mask = 128 >> (bit % 8);
-    if ((bitfield[index] & mask) == 0) {
-      count++;
-      bitfield[index] |= mask;
+    synchronized(this) {
+        if ((bitfield[index] & mask) == 0) {
+            count++;
+            bitfield[index] |= mask;
+        }
    }
  }

+  /**
+   * Sets the given bit to false.
+   *
+   * @exception IndexOutOfBoundsException if bit is smaller then zero
+   * bigger then size (inclusive).
+   * @since 0.9.22
+   */
+  public void clear(int bit)
+  {
+    if (bit < 0 || bit >= size)
+      throw new IndexOutOfBoundsException(Integer.toString(bit));
+    int index = bit/8;
+    int mask = 128 >> (bit % 8);
+    synchronized(this) {
+        if ((bitfield[index] & mask) != 0) {
+            count--;
+            bitfield[index] &= ~mask;
+        }
+    }
+  }
+
+  /**
+   * Sets all bits to true.
+   *
+   * @since 0.9.21
+   */
+  public void setAll() {
+      Arrays.fill(bitfield, (byte) 0xff);
+      count = size;
+  }
+
  /**
   * Return true if the bit is set or false if it is not.
   *
--- a/apps/i2psnark/java/src/org/klomp/snark/CompleteListener.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/CompleteListener.java
@@ -0,0 +1,68 @@
+/* CompleteListener - Callback for Snark events
+   
+   Copyright (C) 2003 Mark J. Wielaard
+
+   This file is part of Snark.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+package org.klomp.snark;
+
+/**
+ *  Callback for Snark events.
+ *  @since 0.9.4 moved from Snark.java
+ */
+public interface CompleteListener {
+    public void torrentComplete(Snark snark);
+    public void updateStatus(Snark snark);
+
+    /**
+     * We transitioned from magnet mode, we have now initialized our
+     * metainfo and storage. The listener should now call getMetaInfo()
+     * and save the data to disk.
+     *
+     * @return the new name for the torrent or null on error
+     * @since 0.8.4
+     */
+    public String gotMetaInfo(Snark snark);
+
+    /**
+     * @since 0.9
+     */
+    public void fatal(Snark snark, String error);
+
+    /**
+     * @since 0.9.2
+     */
+    public void addMessage(Snark snark, String message);
+
+    /**
+     * @since 0.9.4
+     */
+    public void gotPiece(Snark snark);
+
+    /** not really listeners but the easiest way to get back to an optional SnarkManager */
+    public long getSavedTorrentTime(Snark snark);
+    public BitField getSavedTorrentBitField(Snark snark);
+    /**
+     * @since 0.9.15
+     */
+    public boolean getSavedPreserveNamesSetting(Snark snark);
+    /**
+     * @since 0.9.15
+     */
+    public long getSavedUploaded(Snark snark);
+}
--- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
@@ -24,80 +24,116 @@ import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.ConnectException;

 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
+import net.i2p.data.Hash;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
+import net.i2p.util.ObjectCounter;
+import net.i2p.util.SimpleTimer2;

 /**
- * Accepts connections on a TCP port and routes them to sub-acceptors.
+ * Accepts connections on a I2PServerSocket and routes them to PeerAcceptors.
 */
-public class ConnectionAcceptor implements Runnable
+class ConnectionAcceptor implements Runnable
 {
  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(ConnectionAcceptor.class);
-  private I2PServerSocket serverSocket;
-  private PeerAcceptor peeracceptor;
+  private final PeerAcceptor peeracceptor;
  private Thread thread;
-  private I2PSnarkUtil _util;
+  private final I2PSnarkUtil _util;
+  private final ObjectCounter<Hash> _badCounter = new ObjectCounter<Hash>();
+  private final SimpleTimer2.TimedEvent _cleaner;

-  private boolean stop;
-  private boolean socketChanged;
+  private volatile boolean stop;

-  public ConnectionAcceptor(I2PSnarkUtil util) { _util = util; }
+  // protocol errors before blacklisting.
+  private static final int MAX_BAD = 1;
+  private static final long BAD_CLEAN_INTERVAL = 30*60*1000;
+
+  /**
+   *  Multitorrent. Caller MUST call startAccepting()
+   */
+  public ConnectionAcceptor(I2PSnarkUtil util, PeerCoordinatorSet set) {
+      _util = util;
+      _cleaner = new Cleaner();
+      peeracceptor = new PeerAcceptor(set);
+  }
  
-  public synchronized void startAccepting(PeerCoordinatorSet set, I2PServerSocket socket) {
-    if (serverSocket != socket) {
-      if ( (peeracceptor == null) || (peeracceptor.coordinators != set) )
-        peeracceptor = new PeerAcceptor(set);
-      serverSocket = socket;
+  /**
+   *  May be called even when already running. May be called to start up again after halt().
+   */
+  public synchronized void startAccepting() {
      stop = false;
-      socketChanged = true;
+      if (_log.shouldLog(Log.WARN))
+          _log.warn("ConnectionAcceptor startAccepting new thread? " + (thread == null));
      if (thread == null) {
          thread = new I2PAppThread(this, "I2PSnark acceptor");
          thread.setDaemon(true);
          thread.start();
+          _cleaner.reschedule(BAD_CLEAN_INTERVAL, false);
      }
-    }
  }
  
-  public ConnectionAcceptor(I2PSnarkUtil util, I2PServerSocket serverSocket,
+  /**
+   *  Unused (single torrent).
+   *  Do NOT call startAccepting().
+   */
+  public ConnectionAcceptor(I2PSnarkUtil util,
                            PeerAcceptor peeracceptor)
  {
-    this.serverSocket = serverSocket;
    this.peeracceptor = peeracceptor;
    _util = util;
    
-    socketChanged = false;
-    stop = false;
    thread = new I2PAppThread(this, "I2PSnark acceptor");
    thread.setDaemon(true);
    thread.start();
+    _cleaner = new Cleaner();
  }

-  public void halt()
+  /**
+   *  May be restarted later with startAccepting().
+   */
+  public synchronized void halt()
  {
    if (stop) return;
    stop = true;
+    locked_halt();
+    Thread t = thread;
+    if (t != null) {
+      t.interrupt();
+      thread = null;
+    }
+  }

-    I2PServerSocket ss = serverSocket;
-    if (ss != null)
+
+  /**
+   *  Caller must synch
+   *  @since 0.9.9
+   */
+  private void locked_halt()
+  {
+    I2PServerSocket ss = _util.getServerSocket();
+    if (ss != null) {
      try
        {
          ss.close();
        }
      catch(I2PException ioe) { }
-
-    Thread t = thread;
-    if (t != null)
-      t.interrupt();
+    }
+    _badCounter.clear();
+    _cleaner.cancel();
  }
  
-  public void restart() {
-      serverSocket = _util.getServerSocket();
-      socketChanged = true;
+  /**
+   *  Effectively unused, would only be called if we changed
+   *  I2CP host/port, which is hidden in the gui if in router context
+   *  FIXME this only works if already running
+   */
+  public synchronized void restart() {
      Thread t = thread;
      if (t != null)
          t.interrupt();
@@ -105,21 +141,32 @@ public class ConnectionAcceptor implements Runnable

  public int getPort()
  {
-    return 6881; // serverSocket.getLocalPort();
+    return TrackerClient.PORT; // serverSocket.getLocalPort();
  }

  public void run()
+  {
+      try {
+          run2();
+      } finally {
+          synchronized(this) {
+              thread = null;
+          }
+      }
+  }
+
+  private void run2()
  {
    while(!stop)
      {
-        if (socketChanged) {
-            // ok, already updated
-            socketChanged = false;
-        }
+        I2PServerSocket serverSocket = _util.getServerSocket();
        while ( (serverSocket == null) && (!stop)) {
+            if (!(_util.isConnecting() || _util.connected())) {
+                stop = true;
+                break;
+            }
+            try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
            serverSocket = _util.getServerSocket();
-            if (serverSocket == null)
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
        }
        if(stop)
            break;
@@ -127,18 +174,26 @@ public class ConnectionAcceptor implements Runnable
          {
            I2PSocket socket = serverSocket.accept();
            if (socket == null) {
-                if (socketChanged) {
                    continue;
-                } else {
-                    I2PServerSocket ss = _util.getServerSocket();
-                    if (ss != serverSocket) {
-                        serverSocket = ss;
-                        socketChanged = true;
-                    }
-                }
            } else {
                if (socket.getPeerDestination().equals(_util.getMyDestination())) {
-                    _util.debug("Incoming connection from myself", Snark.ERROR);
+                    _log.error("Incoming connection from myself");
+                    try { socket.close(); } catch (IOException ioe) {}
+                    continue;
+                }
+                Hash h = socket.getPeerDestination().calculateHash();
+                if (socket.getLocalPort() == 80) {
+                     _badCounter.increment(h);
+                    if (_log.shouldLog(Log.WARN))
+                        _log.error("Dropping incoming HTTP from " + h);
+                    try { socket.close(); } catch (IOException ioe) {}
+                    continue;
+                }
+                int bad = _badCounter.count(h);
+                if (bad >= MAX_BAD) {
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("Rejecting connection from " + h +
+                                  " after " + bad + " failures, max is " + MAX_BAD);
                    try { socket.close(); } catch (IOException ioe) {}
                    continue;
                }
@@ -148,33 +203,57 @@ public class ConnectionAcceptor implements Runnable
          }
        catch (I2PException ioe)
          {
-            if (!socketChanged) {
-                _util.debug("Error while accepting: " + ioe, Snark.ERROR);
-                stop = true;
+            int level = stop ? Log.WARN : Log.ERROR;
+            if (_log.shouldLog(level))
+                _log.log(level, "Error while accepting", ioe);
+            synchronized(this) {
+                if (!stop) {
+                    locked_halt();
+                    thread = null;
+                    stop = true;
+                }
+            }
+          }
+        catch (ConnectException ioe)
+          {
+            // This is presumed to be due to socket closing by I2PSnarkUtil.disconnect(),
+            // which does not currently call our halt(), although it should
+            if (_log.shouldWarn())
+                _log.warn("Error while accepting", ioe);
+            synchronized(this) {
+                if (!stop) {
+                    locked_halt();
+                    thread = null;
+                    stop = true;
+                }
            }
          }
        catch (IOException ioe)
          {
-            _util.debug("Error while accepting: " + ioe, Snark.ERROR);
-            stop = true;
+            int level = stop ? Log.WARN : Log.ERROR;
+            if (_log.shouldLog(level))
+                _log.log(level, "Error while accepting", ioe);
+            synchronized(this) {
+                if (!stop) {
+                    locked_halt();
+                    thread = null;
+                    stop = true;
+                }
+            }
          }
        // catch oom?
      }
-
-    try
-      {
-        if (serverSocket != null)
-          serverSocket.close();
-      }
-    catch (I2PException ignored) { }
-    
+      if (_log.shouldLog(Log.WARN))
+          _log.warn("ConnectionAcceptor closed");
  }
  
  private class Handler implements Runnable {
-      private I2PSocket _socket;
+      private final I2PSocket _socket;
+
      public Handler(I2PSocket socket) {
          _socket = socket;
      }
+
      public void run() {
          try {
              InputStream in = _socket.getInputStream();
@@ -182,13 +261,33 @@ public class ConnectionAcceptor implements Runnable
              // this is for the readahead in PeerAcceptor.connection()
              in = new BufferedInputStream(in);
              if (_log.shouldLog(Log.DEBUG))
-                  _log.debug("Handling socket from " + _socket.getPeerDestination().calculateHash().toBase64());
+                  _log.debug("Handling socket from " + _socket.getPeerDestination().calculateHash());
              peeracceptor.connection(_socket, in, out);
+          } catch (PeerAcceptor.ProtocolException ihe) {
+              _badCounter.increment(_socket.getPeerDestination().calculateHash());
+              if (_log.shouldLog(Log.INFO))
+                  _log.info("Protocol error from " + _socket.getPeerDestination().calculateHash(), ihe);
+              try { _socket.close(); } catch (IOException ignored) { }
          } catch (IOException ioe) {
              if (_log.shouldLog(Log.DEBUG))
-                  _log.debug("Error handling connection from " + _socket.getPeerDestination().calculateHash().toBase64(), ioe);
+                  _log.debug("Error handling connection from " + _socket.getPeerDestination().calculateHash(), ioe);
              try { _socket.close(); } catch (IOException ignored) { }
          }
      }
  }
+
+    /** @since 0.9.1 */    
+    private class Cleaner extends SimpleTimer2.TimedEvent {
+
+        public Cleaner() {
+            super(_util.getContext().simpleTimer2());
+        }
+
+        public void timeReached() {
+            if (stop)
+                return;
+            _badCounter.clear();
+            schedule(BAD_CLEAN_INTERVAL);
+        }
+    }
 }
--- a/Show More
+++ b/Show More