merge of '468d5271753b5b44fff6890ecd33d03b684d8e18'

     and 'cd4b79fe5aae3f17a3def305c7a3494a8db5dc74'

apps/BOB/nbproject/project.properties

@@ -26,7 +26,7 @@ dist.dir=dist
 dist.jar=${dist.dir}/BOB.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=**/*.html
+excludes=**/*.html,**/*.txt
 file.reference.build-javadoc=../../i2p.i2p/build/javadoc
 file.reference.i2p.jar=../../core/java/build/i2p.jar
 file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar

history.txt

@@ -7,6 +7,9 @@
     * Reseed: Give up on a seed after 90% of fetches fail
     * SessionKey: Enforce data size and prevent reuse
 
+2011-06-02 sponge
+    * Remove txt file in BOB.jar as per zzz's request.
+
 2011-06-01 zzz
     * Crypto:
       - Use java.security.MessageDigest instead of bundled GNU SHA-256 code