merge of 'b12b7f42f59f400abd7032f3f2bffba289f3ec7a'

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

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

...terconsole/java/src/net/i2p/router/web/PluginStarter.java

.../java/src/net/i2p/client/streaming/ConnectionOptions.java

...src/net/i2p/client/streaming/ConnectionPacketHandler.java

history.txt

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

.../java/src/net/i2p/router/startup/CreateRouterInfoJob.java

...er/java/src/net/i2p/router/startup/LoadRouterInfoJob.java

...java/src/net/i2p/router/startup/RebuildRouterInfoJob.java

...rc/net/i2p/router/transport/udp/EstablishmentManager.java

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

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