Merge branch 'master' into 'i2p.i2p.2.4.0-segmented-netdb-safer-inter…

…faces'

# Conflicts:
#   apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java
#   apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHelper.java
#   apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
#   apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
#   apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
#   apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java
#   router/java/src/net/i2p/router/Banlist.java
#   router/java/src/net/i2p/router/Blocklist.java
#   router/java/src/net/i2p/router/MultiRouter.java
#   router/java/src/net/i2p/router/Router.java
#   router/java/src/net/i2p/router/client/ClientConnectionRunner.java
#   router/java/src/net/i2p/router/client/ClientMessageEventListener.java
#   router/java/src/net/i2p/router/client/LookupDestJob.java
#   router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
#   router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
#   router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
#   router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java
#   router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
#   router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
#   router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java
#   router/java/src/net/i2p/router/sybil/Analysis.java
#   router/java/src/net/i2p/router/tasks/Republish.java
#   router/java/src/net/i2p/router/tasks/UpdateRoutingKeyModifierJob.java
#   router/java/src/net/i2p/router/transport/GeoIP.java
#   router/java/src/net/i2p/router/transport/TransportImpl.java
#   router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
#   router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
#   router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
#   router/java/src/net/i2p/router/transport/udp/PeerState2.java
#   router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
#   router/java/src/net/i2p/router/transport/udp/UDPTransport.java
#   router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
#   router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java
#   router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
#   router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java