merge of '6ac923b4b6f858e909094ff3d0fbfbbfba7ff9d4'

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

...2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

apps/i2ptunnel/jsp/editClient.jsp

apps/i2ptunnel/jsp/editServer.jsp

apps/i2ptunnel/jsp/index.jsp

core/java/src/net/i2p/crypto/ElGamalAESEngine.java

core/java/src/net/i2p/crypto/ElGamalEngine.java

core/java/src/net/i2p/crypto/SHA256Generator.java

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

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

core/java/src/net/i2p/data/Lease.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

core/java/src/net/i2p/data/i2cp/DestLookupMessage.java

core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java

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

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