merge of '4cd641356d3ecf443fa79aa64c8ad553a37022da'

apps/addressbook/web.xml

apps/i2psnark/web.xml

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

apps/i2ptunnel/jsp/web.xml

apps/routerconsole/jsp/web.xml

...ng/java/src/net/i2p/client/streaming/impl/Connection.java

apps/susimail/src/WEB-INF/web.xml

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

history.txt

installer/resources/eepsite/jetty-ssl.xml

installer/resources/eepsite/jetty.xml

installer/resources/i2ptunnel.config

router/java/src/net/i2p/router/JobQueue.java

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

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

router/java/src/net/i2p/router/tasks/InstallUpdate.java

router/java/src/net/i2p/router/tasks/package.html

...a/src/net/i2p/router/transport/FIFOBandwidthRefiller.java

...ava/src/net/i2p/router/tunnel/BloomFilterIVValidator.java

router/java/src/net/i2p/router/util/DecayingBloomFilter.java