merge of '5a88275dbd49dfde016676939fb28b1387447216'

and 'b4afc02ff8ecaf95f621169763cfa99e3f309102'

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

@@ -125,7 +125,7 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr
             if (initialI2PData != null) {
                 synchronized (slock) {
                     i2pout.write(initialI2PData);
-                    //i2pout.flush();
+                    i2pout.flush();
                 }
             }
             if (initialSocketData != null) {

history.txt

@@ -1,3 +1,7 @@
+2010-02-10 zzz
+    * I2PTunnelRunner: Flush initial data, for some reason it wasn't
+      getting flushed ever in some cases.
+
 2010-02-10 zzz
     64-bit windows installer fixes. Still no 64-bit wrapper.
     Thanks eche|on for testing!

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */
     public final static String EXTRA = "";