merge of '03b8e025ba8c54efe24644ee68500ae2ff0ea2de'

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

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

history.txt

router/java/src/net/i2p/router/Router.java

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