diff --git a/history.txt b/history.txt index f445860c9e..9659dbeb41 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,5 @@ 2019-05-02 zzz + * GeoIP Maxmind 2019-04-29 * NTCP: Rare EventPumper 100% CPU fix (ticket #2476) 2019-04-25 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 47667df539..895e8eb464 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 = 9; + public final static long BUILD = 10; /** for example "-test" */ public final static String EXTRA = "-rc"; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index 0d0e85a008..2164174daa 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1128,6 +1128,7 @@ public class NTCPConnection implements Closeable { synchronized void outboundConnected() { if (_establishState == EstablishBase.FAILED) { _conKey.cancel(); + try {_chan.close(); } catch (IOException ignored) {} return; } _conKey.interestOps(_conKey.interestOps() | SelectionKey.OP_READ);