From 37c6ac3a88618256dcb5bbfee101bac33757c158 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 24 Apr 2015 01:48:07 +0000
Subject: [PATCH] i2ptunnel: Fix Socks and SocksIRC tunnels not starting,
 broken in fix for ticket #815

---
 .../java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 5 -----
 history.txt                                              | 9 +++++++++
 router/java/src/net/i2p/router/RouterVersion.java        | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
index 6f8f6b3d3..19ab11a46 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
@@ -42,11 +42,6 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
     public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel, String pkf) {
         super(localPort, ownDest, l, notifyThis, "SOCKS Proxy on " + tunnel.listenHost + ':' + localPort, tunnel, pkf);
 
-        if (waitEventValue("openBaseClientResult").equals("error")) {
-            notifyEvent("openSOCKSTunnelResult", "error");
-            return;
-        }
-
         setName("SOCKS Proxy on " + tunnel.listenHost + ':' + localPort);
         parseOptions();
         notifyEvent("openSOCKSTunnelResult", "ok");
diff --git a/history.txt b/history.txt
index 3afb4766c..17bb61688 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2015-04-24 zzz
+ * i2ptunnel: Fix Socks and SocksIRC tunnels not starting
+
+2015-04-23 zzz
+ * Streaming:
+   - Reduce min RTO for quicker recovery after packet loss
+   - Reduce default initial ack delay
+   - More efficient checking for input buffer overflow
+
 2015-04-22 zzz
  * i2psnark: Fix deletion of config files, cleanup old ones (ticket #1498)
  * I2PSocketEepGet: Fix i2psnark NPE caused by -6 (ticket #1543)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fecba78d6..a6204817e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";