merge of '9ec612b8794a44b9337b7743afef8ccbb2fc904e'

...ming/java/src/net/i2p/client/streaming/ConnThrottler.java

core/java/src/net/i2p/data/LeaseSet.java

history.txt

...r/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java

router/java/src/net/i2p/router/NetworkDatabaseFacade.java

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

.../i2p/router/networkdb/HandleDatabaseLookupMessageJob.java

...2p/router/networkdb/kademlia/FloodOnlyLookupMatchJob.java

.../i2p/router/networkdb/kademlia/FloodfillPeerSelector.java

...kdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java

...rkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java

...ter/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

...a/src/net/i2p/router/networkdb/kademlia/PeerSelector.java

...r/java/src/net/i2p/router/transport/ntcp/EventPumper.java

.../src/net/i2p/router/tunnel/InboundMessageDistributor.java