propagate from branch 'i2p.i2p.zzz.test2' (head 7db2f2b73bc7c44b4be1077185314201c5b0bfe6)

to branch 'i2p.i2p' (head ea9844ecc27e816a09cf5d9b36c10ee2c3d1bcc9)

core/java/src/net/i2p/CoreVersion.java

@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.9.10";
+    public final static String VERSION = "0.9.11";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);

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

@@ -128,8 +128,7 @@ public class I2PAppContext {
                          _lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(),
                          _lock9 = new Object(), _lock10 = new Object(), _lock11 = new Object(), _lock12 = new Object(),
                          _lock13 = new Object(), _lock14 = new Object(), _lock15 = new Object(), _lock16 = new Object(),
-                         _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object(),
-                         _lock21 = new Object();
+                         _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object();
 
     /**
      * Pull the default context, creating a new one if necessary, else using 

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

@@ -24,7 +24,7 @@ import net.i2p.util.OrderedProperties;
  * Only supported from client to router.
  *
  * Since 0.8.7, optionally include a version string.
- * Since 0.9.10, optionally include options.
+ * Since 0.9.11, optionally include options.
  */
 public class GetDateMessage extends I2CPMessageImpl {
     public final static int MESSAGE_TYPE = 32;
@@ -49,7 +49,7 @@ public class GetDateMessage extends I2CPMessageImpl {
      *                 must be non-null if options is non-null and non-empty.
      *  @param options Client options to be sent to the router; primarily for authentication; may be null;
      *                 keys and values 255 bytes (not chars) max each
-     *  @since 0.9.10
+     *  @since 0.9.11
      */
     public GetDateMessage(String version, Properties options) {
         super();
@@ -72,7 +72,7 @@ public class GetDateMessage extends I2CPMessageImpl {
      *  Primarily for authentication.
      *
      *  @return may be null
-     *  @since 0.9.10
+     *  @since 0.9.11
      */
     public Properties getOptions() {
         return _options;

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

@@ -23,7 +23,7 @@ public class I2CPMessageHandler {
 
     /**
      *  This is huge. Mainly to catch a completly bogus response, possibly not an I2CP socket.
-     *  @since 0.9.10
+     *  @since 0.9.11
      */
     public static final int MAX_LENGTH = 128*1024;