merge of '50335c064a9992f4ba8707d62d35bbbbe752d231'

...addressbook/java/src/net/i2p/addressbook/AddressBook.java

...ddressbook/java/src/net/i2p/addressbook/ConfigParser.java

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

...ddressbook/java/src/net/i2p/addressbook/DaemonThread.java

apps/addressbook/java/src/net/i2p/addressbook/Log.java

...ddressbook/java/src/net/i2p/addressbook/Subscription.java

...ok/java/src/net/i2p/addressbook/SubscriptionIterator.java

...ssbook/java/src/net/i2p/addressbook/SubscriptionList.java

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

apps/i2psnark/java/src/org/klomp/snark/Storage.java

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

...el/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

...tunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

...i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

...nnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java

...2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

...l/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java