merge of '1e0d390eeacce432f968251f1bbbe03ef031a116'

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

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

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

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

history.txt

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