diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java index 139d080d41..627113abec 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java @@ -565,7 +565,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { public int getMaxConnsPerMinute() { return _maxConnsPerMinute; } public int getMaxConnsPerHour() { return _maxConnsPerHour; } public int getMaxConnsPerDay() { return _maxConnsPerDay; } - public int getMaxTotalConnsPerMinute() { return _maxConnsPerMinute; } + public int getMaxTotalConnsPerMinute() { return _maxTotalConnsPerMinute; } public int getMaxTotalConnsPerHour() { return _maxTotalConnsPerHour; } public int getMaxTotalConnsPerDay() { return _maxTotalConnsPerDay; } diff --git a/history.txt b/history.txt index 6a954bc34a..0d212c15fd 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,21 @@ +2010-05-10 zzz + * Console: + - Summary bar tweaks + - Add monthly bw estimate + * DataHelper: Deprecate inefficient eq() methods + * i2psnark: + - Add tunnel config dropdowns + - Comment out old proxy stuff + * NetDB: + - Handle old and duplicate stores more efficiently + - Have DataStore put() return success + - Move getDistance() to its own class + * Router: Add router.forceBandwidthClass advanced config for testing + * Streaming: Add support for connection throttling + * TunnelPoolManager: Concurrent + * UDP: To help limit connections, don't offer to introduce + when floodfill + 2010-05-10 sponge * PluginStarter: If there is some delay, there may be a really good reason for it. Loading a class would be one of them! diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5c..4e28a2c8d2 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 = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = "";