diff --git a/INSTALL-headless.txt b/INSTALL-headless.txt
index dcc5117e721a04a040cb1372ee55195cf96e55c9..8f6e3e93391c176f354f2242a3ff978cf2dd4ce3 100644
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -12,7 +12,7 @@ you may use:
to configure the router.
If you're having trouble, swing by http://forum.i2p/, check the
-website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p
+website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p
I2P will create and store files and configuration data in the user directory
~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
diff --git a/README.txt b/README.txt
index fad70c410b36b277deb9ea8385d1529f0e8b31f0..d115a6dbf25b07382c04fd2eae31d726570fba56 100644
--- a/README.txt
+++ b/README.txt
@@ -15,20 +15,20 @@ To build:
ant installer-osx
Run 'ant' with no arguments to see other build options.
- See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
+ See INSTALL.txt or https://geti2p.net/download for installation instructions.
Documentation:
- http://www.i2p2.de/how
+ https://geti2p.net/how
API: run 'ant javadoc' then start at build/javadoc/index.html
Latest release:
- http://www.i2p2.de/download
+ https://geti2p.net/download
To get development branch from source control:
- http://www.i2p2.de/newdevelopers
+ https://geti2p.net/newdevelopers
FAQ:
- http://www.i2p2.de/faq
+ https://geti2p.net/faq
Need help?
IRC irc.freenode.net #i2p
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index 9a7b44486d67ac3ec21a2a14865815510bfc196f..ed18fcbe998a7d03e08a3838bc4acb6ee44b44f9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -1319,7 +1319,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
*
* @param args {username, password}
* @param l logger to receive events and output
- * @since 0.9.10
+ * @since 0.9.11
*/
private void runAuth(String args[], Logging l) {
if (args.length == 2) {
@@ -1774,7 +1774,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* @param i2cpPort may be null
* @param user may be null
* @param pw may be null
- * @since 0.9.10
+ * @since 0.9.11
*/
private static Destination destFromName(String name, String i2cpHost,
String i2cpPort, boolean isSSL,
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index 17ea0019f0b62b71d17ad3abce99c7842d328f36..5b06e271b6e5461cf337c350ae183c93b6a1ae03 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -55,7 +55,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
private int localPort;
/**
- * Protected for I2Ping since 0.9.10. Not for use outside package.
+ * Protected for I2Ping since 0.9.11. Not for use outside package.
*/
protected boolean listenerReady;
@@ -586,7 +586,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
}
/**
- * Non-final since 0.9.10.
+ * Non-final since 0.9.11.
* Any overrides must set listenerReady = true.
*/
public void run() {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
index 3e8a0a2482ce742a3d7b7744ab3db1d8ec816d59..e8321e41acf4dcaaceacaaab79994f653bcd44ed 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
@@ -246,7 +246,7 @@ public class I2Ping extends I2PTunnelClientBase {
/**
* Does nothing.
- * @since 0.9.10
+ * @since 0.9.11
*/
protected void clientConnectionRun(Socket s) {}
@@ -260,7 +260,7 @@ public class I2Ping extends I2PTunnelClientBase {
private final int remotePort;
/**
- * As of 0.9.10, does NOT start itself.
+ * As of 0.9.11, does NOT start itself.
* Caller must call start()
* @param dest b64 or b32 or host name
*/
@@ -329,7 +329,7 @@ public class I2Ping extends I2PTunnelClientBase {
/**
* @param name b64 or b32 or host name
- * @since 0.9.10
+ * @since 0.9.11
*/
private Destination lookup(String name) {
I2PAppContext ctx = I2PAppContext.getGlobalContext();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 6327c05a912403ee1520be6534bfb38680b0b0b1..ba65110ef93d65eeff53864df277eb0b618a2021 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -103,11 +103,33 @@ public class ConfigUIHelper extends HelperBase {
/** todo sort by translated string */
public String getLangSettings() {
- StringBuilder buf = new StringBuilder(512);
- String current = Messages.getLanguage(_context);
+ String clang = Messages.getLanguage(_context);
+ String current = clang;
String country = Messages.getCountry(_context);
if (country != null && country.length() > 0)
current += '_' + country;
+ // find best match
+ boolean found = false;
+ for (int i = 0; i < langs.length; i++) {
+ if (langs[i][0].equals(current)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ if (country != null && country.length() > 0) {
+ current = clang;
+ for (int i = 0; i < langs.length; i++) {
+ if (langs[i][0].equals(current)) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found)
+ current = "en";
+ }
+ StringBuilder buf = new StringBuilder(512);
for (int i = 0; i < langs.length; i++) {
// we use "lang" so it is set automagically in CSSHelper
buf.append("<input type=\"radio\" class=\"optbox\" name=\"lang\" ");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index b98a02119bc7e1be4c2c721b0bcbe031e7f171db..3a76ffb7bfe4e1d77e19a93c179e4e8a969b2fd5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -351,7 +351,7 @@ public class GraphHelper extends FormHandler {
try {
_out.write("<br><h3>" + _("Configure Graph Display") + " [<a href=\"configstats\">" + _("Select Stats") + "</a>]</h3>");
_out.write("<form action=\"graphs\" method=\"POST\">\n" +
- "<input type=\"hidden\" name=\"action\" value=\"foo\">\n" +
+ "<input type=\"hidden\" name=\"action\" value=\"save\">\n" +
"<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n");
_out.write(_("Periods") + ": <input size=\"5\" style=\"text-align: right;\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\"><br>\n");
_out.write(_("Plot averages") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"checked\" ") + "> ");
@@ -380,7 +380,7 @@ public class GraphHelper extends FormHandler {
if (persistent)
_out.write(" checked=\"checked\"");
_out.write(">" +
- "<hr><div class=\"formaction\"><input type=\"submit\" class=\"acceot\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
+ "<hr><div class=\"formaction\"><input type=\"submit\" class=\"accept\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
} catch (IOException ioe) {
ioe.printStackTrace();
}
@@ -413,7 +413,8 @@ public class GraphHelper extends FormHandler {
*/
@Override
protected void processForm() {
- saveSettings();
+ if ("save".equals(_action))
+ saveSettings();
}
/**
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
index b4572e53b13621be3b358fd338c536dba237bac2..3cd7d9046b324baca53fa0f3285699348269cb7e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
@@ -78,8 +78,17 @@ class SummaryListener implements RateSummaryListener {
//String names[] = _sample.getDsNames();
//System.out.println("Add " + val + " over " + eventCount + " for " + _name
// + " [" + names[0] + ", " + names[1] + "]");
+ } catch (IllegalArgumentException iae) {
+ // ticket #1186
+ // apparently a corrupt file, thrown from update()
+ _log.error("Error adding", iae);
+ String path = _isPersistent ? _db.getPath() : null;
+ stopListening();
+ if (path != null)
+ (new File(path)).delete();
} catch (IOException ioe) {
_log.error("Error adding", ioe);
+ stopListening();
} catch (RrdException re) {
// this can happen after the time slews backwards, so don't make it an error
// org.jrobin.core.RrdException: Bad sample timestamp 1264343107. Last update time was 1264343172, at least one second step is required
diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp
index 5f7b96ccb92015d618494aa9afdf96c26c74ae98..9de0fc0062beafb322f64b5201f2b7c3f67a2293 100644
--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -31,7 +31,9 @@
%><%=intl._("Please report bugs on {0} or {1}.",
"<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
"<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
+<!--
<%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
+-->
<p><%=intl._("Please include this information in bug reports")%>:
</p></div><div class="sorry" id="warning2">
<h3><%=intl._("Error Details")%></h3>
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 80ef70b9d349ed21e058ec33b82d265c8b5efa97..538ae2abf5594a69812e75e78953833e55c556c0 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -17,7 +17,9 @@
%><%=intl._("Please report bugs on {0} or {1}.",
"<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
"<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
+<!--
<%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
+-->
<p><i><%=intl._("Please include this information in bug reports")%>:</i>
<p>
<b>I2P version:</b> <%=net.i2p.router.RouterVersion.FULL_VERSION%><br>
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 96a3ef8c92f2aa355d6fcbb9db2735c947e8bce7..5d59638d535d2fd5736f75ff96e89ecf0f68f8d6 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -16,7 +16,7 @@ package net.i2p;
public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
- public final static String VERSION = "0.9.10";
+ public final static String VERSION = "0.9.11";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 4eb2fcdbdbf10e4579ccf5ff1e26eb55035fd4b5..69e110632ea1962709228952bd492b9b333f9692 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -128,8 +128,7 @@ public class I2PAppContext {
_lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(),
_lock9 = new Object(), _lock10 = new Object(), _lock11 = new Object(), _lock12 = new Object(),
_lock13 = new Object(), _lock14 = new Object(), _lock15 = new Object(), _lock16 = new Object(),
- _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object(),
- _lock21 = new Object();
+ _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object();
/**
* Pull the default context, creating a new one if necessary, else using
diff --git a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
index 087062cbb2cecaea1d65b2fa8aebd31bc4f00655..00c5a75b87a25c21be523551d68ef48b1f2aa0c3 100644
--- a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
@@ -24,7 +24,7 @@ import net.i2p.util.OrderedProperties;
* Only supported from client to router.
*
* Since 0.8.7, optionally include a version string.
- * Since 0.9.10, optionally include options.
+ * Since 0.9.11, optionally include options.
*/
public class GetDateMessage extends I2CPMessageImpl {
public final static int MESSAGE_TYPE = 32;
@@ -49,7 +49,7 @@ public class GetDateMessage extends I2CPMessageImpl {
* must be non-null if options is non-null and non-empty.
* @param options Client options to be sent to the router; primarily for authentication; may be null;
* keys and values 255 bytes (not chars) max each
- * @since 0.9.10
+ * @since 0.9.11
*/
public GetDateMessage(String version, Properties options) {
super();
@@ -72,7 +72,7 @@ public class GetDateMessage extends I2CPMessageImpl {
* Primarily for authentication.
*
* @return may be null
- * @since 0.9.10
+ * @since 0.9.11
*/
public Properties getOptions() {
return _options;
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
index bf34befde1c00ebfc6ab28b579ed9d9aee5cde7b..915757fc09e8d4860185091139e96898c1ea907d 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
@@ -23,7 +23,7 @@ public class I2CPMessageHandler {
/**
* This is huge. Mainly to catch a completly bogus response, possibly not an I2CP socket.
- * @since 0.9.10
+ * @since 0.9.11
*/
public static final int MAX_LENGTH = 128*1024;
diff --git a/history.txt b/history.txt
index dc27e801262f575c70df3c2decb33fb4d37e8c46..40db4b8e1b6d9802ecd949fc16cafd3bfaf55bd9 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,14 @@
+2014-02-10 zzz
+ * Console:
+ - Don't reset graph settings when clicking restart or shutdown on graphs page
+ - Don't recommend guest login on trac, it's disabled
+ - Catch and remove corrupt jrb file (ticket #1186)
+ - Always set default language on /configui
+ * Transports: Reduce target connection count again to reduce
+ tunnel reject rate further
+
+* 2014-02-08 0.9.11 released
+
2014-02-07 zzz
* Services:
- Move backup news to psi.i2p
diff --git a/installer/install.xml b/installer/install.xml
index 6f1015a6194165d50a4468d813523941ef8b3692..d1c6d79040affd4f4ee2ab09c444e5fd0fbc8231 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
<info>
<appname>i2p</appname>
- <appversion>0.9.10</appversion>
+ <appversion>0.9.11</appversion>
<authors>
<author name="I2P" email="https://geti2p.net/"/>
</authors>
diff --git a/installer/resources/checklist.txt b/installer/resources/checklist.txt
index db51258feab8704afa4489c863b392db818e8e23..80f4c8336a217c5d6f3eb892f1eb0e3d44896d33 100644
--- a/installer/resources/checklist.txt
+++ b/installer/resources/checklist.txt
@@ -73,17 +73,17 @@ Seed update torrents
Notify the following people:
All in-network update hosts
PPA maintainer
- Google code maintainer
news.xml maintainer
+ backup news.xml maintainer
Website files to change:
- Sync with mtn.i2p2.i2p
+ Sync with mtn.i2p-projekt.i2p
hosts.txt if it changed (copy from i2p.i2p mtn branch)
i2p2www/__init__.py (release number)
i2p2www/pages/downloads/list.html (checksums)
i2p2www/static/news/news.xml
New release announcement - see i2p2www/blog/README for instructions
- Sync with mtn.i2p2.i2p
+ Sync with mtn.i2p-projekt.i2p
Announce on:
#i2p, #i2p-dev (also on freenode side)
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index dc4461386651651e9593d7406cdfffdcf3adb00f..0356d50ff69fe635d880c0eb3c1fcf221130b2c8 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -352,3 +352,4 @@ salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq
no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA
i2pjump.i2p=ouBpQCfwiBcdoZD3vMNT8HXB091kwgI766U6sdWhstY6~7Aixpo8JsNaSO1LV01I20kEzAgmWP8cf5469gSa-YeXAjhKSQPtUgQiKCoRhv2virj--~ecvv4OhyIzCiYoWMMFHV50c02Lg~EE8LGbEkIbRXUZaIWlYwnLC-MzPtuSXhFjHW03h0v~QGeIlYFr8nkpBayqdB8SLkieKygnlOgLRSehmHWZeA0yIz1aCpDuTrZAmAdb3ZwcNm0fxWl~AEpELZ-ax8x6Ibb0kHgPxP1lRr1J7MH~yYXrkymqIPEj-sNLavlAN5oEK6~A45hLd-IENfQ9v-AlntZMon~zeDvxDwHqyKy4OOCbHV7LmitYryEZTVoQNDPPHa6o0pnkBjaPWEnJoDqzU~s-alViTYwR7qkGZMxSp~tej~TngU8GUYEHn4kdTnni0~RTY~50ZyI~2~2ESUCIfFWHzYKQXclzt-uxmNsCL7npmD1-MKZUQ1ECwPR2xKv5vqJwO5ZKAAAA
psi.i2p=a11l91etedRW5Kl2GhdDI9qiRBbDRAQY6TWJb8KlSc0P9WUrEviABAAltqDU1DFJrRhMAZg5i6rWGszkJrF-pWLQK9JOH33l4~mQjB8Hkt83l9qnNJPUlGlh9yIfBY40CQ0Ermy8gzjHLayUpypDJFv2V6rHLwxAQeaXJu8YXbyvCucEu9i6HVO49akXW9YSxcZEqxK04wZnjBqhHGlVbehleMqTx9nkd0pUpBZz~vIaG9matUSHinopEo6Wegml9FEz~FEaQpPknKuMAGGSNFVJb0NtaOQSAocAOg1nLKh80v232Y8sJOHG63asSJoBa6bGwjIHftsqD~lEmVV4NkgNPybmvsD1SCbMQ2ExaCXFPVQV-yJhIAPN9MRVT9cSBT2GCq-vpMwdJ5Nf0iPR3M-Ak961JUwWXPYTL79toXCgxDX2~nZ5QFRV490YNnfB7LQu10G89wG8lzS9GWf2i-nk~~ez0Lq0dH7qQokFXdUkPc7bvSrxqkytrbd-h8O8AAAA
+irc.dg.i2p=bunRitjuWmSGkf5UV7pnjMRIxmP7fuHy9SgDfAA0M~4TWoBr4Ji4m5AyMGzhAdNaQW6c2-0CIe~RCDZ~vcN-BSNpaqzd80gKhXYxqUQQB83XRWDdLz-z0H~Y15k90p~n0GUSzsjlZctkYglNMyQ8MAUIpUEiLz6MVwArZqUI-CDOE664ZazcGtSKfBLZKycHsSj6WfLbwl2-R5Zv4f5Xisv9Hd0b8BsqJEWn1AmBMhM7p8l7okM2ZcRnC5ypzBdLfLSdkGJ5dEZAJIxz-GhtB8rJ3e0jJkbFjknGrJfxbwt~5n00nVuiUNMro2JRxQ7w~VzMw~lYRq~1B5TMtaKRDhxk7pnv5MxmVBFNhcT~hImcyxfT7GfIPzYU9s~uiFReoSjAOJZv-rKq4Oyeyz-Pa6lcg-c3MtuTXjJ2BMX2dA5Jw0FFVDDMOdDL2b1lwtyseQQkGtc15i4EtNy6iJrkbqAnIhO86E2C3jDf~yt2FlDlcbx6dkflJ3y3j2Wu9DAgAAAA
diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html
index 73b8d07b6d079f407f3c1b01f16243754a0a9edb..dcb3bb529d8d376427d9b8bfe5fe62fe9c2c5900 100644
--- a/installer/resources/readme/readme_fr.html
+++ b/installer/resources/readme/readme_fr.html
@@ -1,5 +1,4 @@
<div lang="fr">
-(traduction de mars 2011 - cliquez sur le drapeau ci-dessus pour l'original en anglais)
<ul class="links"><li class="tidylist"><b>Démarrage…</b><br>Si vous venez juste de lancer I2P, le nombre de
<i>pairs actifs</i> indiqués dans la section <i>Pairs</i> du "Panneau de surveillance" sur la gauche devrait
commencer à augmenter dans les prochaines minutes et vous verrez alors en bas du panneau une <i>destination locale</i>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 46b0184db48d53563372c1b5952489406572611c..87e5bffca0684477c0ba8daee48da05fbea99f44 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 11;
+ public final static long BUILD = 1;
/** for example "-test" */
- public final static String EXTRA = "-rc";
+ public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);
diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
index 43cdba3bac1d06adc43384358bf791ab1039c154..d4fd7521acaab9ba5719aa4be396cf2e8e0ef8dd 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
@@ -211,7 +211,7 @@ class EventPumper implements Runnable {
int failsafeInvalid = 0;
// Increase allowed idle time if we are well under allowed connections, otherwise decrease
- if (_transport.haveCapacity(45))
+ if (_transport.haveCapacity(33))
_expireIdleWriteTime = Math.min(_expireIdleWriteTime + 1000, MAX_EXPIRE_IDLE_TIME);
else
_expireIdleWriteTime = Math.max(_expireIdleWriteTime - 3000, MIN_EXPIRE_IDLE_TIME);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 1be488e2759fba95e3656358b6e7b1f60eb15e0d..239060bffff21930cafcdc9d75e3d00acad5e569 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -2846,7 +2846,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
public void timeReached() {
// Increase allowed idle time if we are well under allowed connections, otherwise decrease
- if (haveCapacity(45)) {
+ if (haveCapacity(33)) {
long inc;
// don't adjust too quickly if we are looping fast
if (_lastLoopShort)