merge of '65af54c284a3e8def1740b26114d3ed42ccae172'

android/README.txt

android/build.properties

android/build.xml

android/res/raw/router_config

android/src/net/i2p/router/I2PAndroid.java

android/src/net/i2p/util/LogWriter.java

android/src/net/i2p/util/SecureDirectory.java

android/src/net/i2p/util/SecureFile.java

android/src/net/i2p/util/SecureFileOutputStream.java

apps/i2psnark/java/src/org/klomp/snark/Storage.java

core/java/src/net/i2p/I2PAppContext.java

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

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

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

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

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

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

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

core/java/src/org/bouncycastle/crypto/macs/I2PHMac.java

history.txt