merge of '1045fe48c576267959eae499a22776d9f9acafc3'

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

...i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

core/java/src/net/i2p/client/I2PSessionImpl.java

core/java/src/net/i2p/client/I2PSimpleSession.java

core/java/src/net/i2p/util/EepGet.java

core/java/src/net/i2p/util/InternalServerSocket.java

core/java/src/net/i2p/util/SSLEepGet.java

history.txt

router/java/src/net/i2p/router/RouterVersion.java

...ava/src/net/i2p/router/client/ClientConnectionRunner.java

...net/i2p/router/transport/udp/InboundMessageFragments.java

...ava/src/net/i2p/router/transport/udp/MessageReceiver.java

.../java/src/net/i2p/router/transport/udp/PacketHandler.java

router/java/src/net/i2p/router/transport/udp/UDPPacket.java

...er/java/src/net/i2p/router/transport/udp/UDPReceiver.java