diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 5321e10d8..267bc312c 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -1183,8 +1183,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn } public static final String DEFAULT_JUMP_SERVERS = "http://i2host.i2p/cgi-bin/i2hostjump?," + - "http://stats.i2p/cgi-bin/jump.cgi?a=," + - "http://i2jump.i2p/"; + "http://stats.i2p/cgi-bin/jump.cgi?a="; + //"http://i2jump.i2p/"; /** * @param jumpServers comma- or space-separated list, or null @@ -1242,8 +1242,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn out.write(jurl.getBytes()); out.write(uri.getBytes()); out.write("\">".getBytes()); - out.write(jurl.substring(7).getBytes()); - out.write(uri.getBytes()); + // Translators: parameter is a host name + out.write(_("{0} jump service", jumphost).getBytes()); out.write("\n".getBytes()); } } diff --git a/history.txt b/history.txt index 98ac2da20..6cc1f4cd6 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,20 @@ +2012-06-15 zzz + * I2PSocketEepGet: Use specified port + * I2PTunnel: + - Don't strip port from an I2P URL + - More client options cleanups + - Options changes now propagate to running + socket managers and sessions, and through to the router + - Better parsing of jump server URLs + * NetDB: Only publish stats every so often, to improve + anonymity while preserving the ability to monitor + the network (effective next release) + * SocketManager: + - Simplify factory, use 4-arg constructor, + make fields final, deprecate 0-arg constructor + - Improve how options are updated + - Javadocs + 2012-06-13 zzz * I2PSocketEepGet: Set port to 80 * I2PTunnel: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 31c35f8c3..ea17ad55f 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 = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = "";