diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index 665b54feb9..d20ceb982d 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -26,7 +26,6 @@ import net.i2p.crypto.TransientSessionKeyManager; import net.i2p.data.Base64; import net.i2p.data.RoutingKeyGenerator; import net.i2p.internal.InternalClientManager; -import net.i2p.outproxy.Outproxy; import net.i2p.stat.StatManager; import net.i2p.update.UpdateManager; import net.i2p.util.Clock; @@ -96,7 +95,6 @@ public class I2PAppContext { private SimpleTimer _simpleTimer; private SimpleTimer2 _simpleTimer2; private final PortMapper _portMapper; - private Outproxy _outproxy; private volatile boolean _statManagerInitialized; private volatile boolean _sessionKeyManagerInitialized; private volatile boolean _namingServiceInitialized; diff --git a/history.txt b/history.txt index fd7b901288..ddc7da1205 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,8 @@ 2014-01-25 zzz * i2psnark: Lower threshold for auto-stop + * i2ptunnel HTTP Proxy: + - Add support for HTTPS + - Add support for outproxy plugins * Installer: Update links * NetDB: Fix NPE after client shutdown (ticket #1174) * Router: Lower frequency for publishing stats diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b422..0725033fa6 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 = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = "";