diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh
index 91dd09721164a29076093ef959e34057b78128eb..0f5c9f335b18d3b65e6456c8c8327c83629ab9c5 100644
--- a/Slackware/i2p/doinst.sh
+++ b/Slackware/i2p/doinst.sh
@@ -49,16 +49,21 @@ echo
echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
cd $INST_DIR
-sh postinstall.sh || (
- echo "ERROR: failed execution of postinstall.sh. Please"
- echo "cd into i2p installation directory and run "
- echo "postinstall.sh manually with ./postinstall.sh"
- exit 1
-)
-sleep 10
-sh i2prouter stop || exit 1
+
+OS_ARCH=`uname -m`
+X86_64=`echo "$OS_ARCH" | grep x86_64`
+if [ "X$X86_64" = "X" ]; then
+ wrapperpath="./lib/wrapper/linux"
+else
+ wrapperpath="./lib/wrapper/linux64"
+fi
+cp $wrapperpath/libwrapper.so ./lib/
+cp $wrapperpath/wrapper.jar ./lib/
+cp $wrapperpath/i2psvc .
+rm -rf ./lib/wrapper
+chmod 744 ./i2psvc
echo
echo "Installation finished."
diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild
index 3bb2c950337dbf2ab519cf311bc6966f388e3234..f7ced54bfbb4d727ae3e3f5d2dc1edb9b6972b94 100755
--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -18,7 +18,7 @@
BUILD=1sim
# put here installation dir, without first and last /
-# es: usr/local
+# eg: usr/local
INSTALL_DIR=opt
NAME=i2p
ARCH=noarch
@@ -64,7 +64,7 @@ mkdir -p $PKG
cd $CWD/../../
ant distclean
-ant dist
+#ant dist
ant tarball
tar xjvf i2p.tar.bz2 -C $TMP
@@ -76,6 +76,34 @@ mkdir -p $PKG/$INSTALL_DIR/
cp -a ../i2p $PKG/$INSTALL_DIR/
mkdir -p $PKG/install
+
+#############################################################################
+# Preconfigureation to make package smaller
+#############################################################################
+cd $PKG/$INSTALL_DIR/i2p
+
+# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
+sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a
+sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config
+# eepget %INSTALL_PATH
+sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a
+rm eepget
+mv a eepget
+# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
+sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a
+sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh
+# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
+sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a
+sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter
+
+chmod 744 ./i2prouter
+chmod 744 ./osid
+chmod 744 ./runplain.sh
+chmod 744 ./eepget
+chmod 744 ./scripts/i2pbench.sh
+chmod 744 ./scripts/i2ptest.sh
+rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh
+
mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new
@@ -83,6 +111,7 @@ mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsit
mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
+
cd $PKG
requiredbuilder -v -y -s $CWD $PKG
makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 48bb984b696353152b7f7f293095f88b0316ab95..53ed8274940eb51abc44d36d9ad3728f295c4aba 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -84,6 +84,7 @@ public class IndexBean {
static final String CLIENT_NICKNAME = "shared clients";
public static final String PROP_THEME_NAME = "routerconsole.theme";
+ public static final String DEFAULT_THEME = "light";
public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled";
public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled";
@@ -319,11 +320,8 @@ public class IndexBean {
////
public String getTheme() {
- String theme = _context.getProperty(PROP_THEME_NAME);
- if (theme != null)
- return "/themes/console/" + theme + "/";
- else
- return "/themes/console/";
+ String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
+ return "/themes/console/" + theme + "/";
}
public boolean allowCSS() {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index 6b3916883a85945464c92583946f44698c99a915..a2f3341f9df920f0687c4b21103d45ffc162d8f5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -8,6 +8,7 @@ public class CSSHelper extends HelperBase {
public CSSHelper() {}
public static final String PROP_THEME_NAME = "routerconsole.theme";
+ public static final String DEFAULT_THEME = "light";
private static final String BASE = "/themes/console/";
private static final String FORCE = "classic";
@@ -16,9 +17,8 @@ public class CSSHelper extends HelperBase {
if (userAgent != null && userAgent.contains("MSIE")) {
url += FORCE + "/";
} else {
- String theme = _context.getProperty(PROP_THEME_NAME);
- if (theme != null)
- url += theme + "/";
+ String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
+ url += theme + "/";
}
return url;
}
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 0e0b36a28a811dd24d0540c57e87b57192a4044c..9bfd22077d0c947c57208d2d7a9b6126c86b4a0b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -3,12 +3,11 @@ package net.i2p.router.web;
public class ConfigUIHelper extends HelperBase {
public ConfigUIHelper() {}
- public static final String PROP_THEME = "routerconsole.theme";
private static final String themes[] = {"classic", "dark", "light"};
public String getSettings() {
StringBuilder buf = new StringBuilder(512);
- String current = _context.getProperty(PROP_THEME, "default");
+ String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
for (String theme : themes) {
buf.append("<input type=\"radio\" name=\"theme\" ");
if (theme.equals(current))
diff --git a/history.txt b/history.txt
index 25f62c61776b4919791977eb4509b8969ac251bd..c2ec1c391d46bacae6bce5bb35345c9eac84b3d3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,13 @@
+2009-07-15 zzz
+ * Console:
+ - Make light the default theme
+ - Convert readme_zh.html from GB2312 to UTF-8
+ * Installer: Don't launch the router from the postinstall.sh script
+ on linux anymore; add a panel to the installer to provide launch instructions.
+
+2009-07-15 sponge
+ * Slackware SlackBuild fixes.
+
2009-07-14 dr|z3d
* Increment to 0.7.5-10
* Tidy up layout of readme.* files.
diff --git a/installer/install.xml b/installer/install.xml
index 7f94a7b0665c7b0dd1f6779783077ff78e8ee410..c7b0aafbea95bffca68f2ccacb0f5fa0a9159546 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -85,6 +85,7 @@
<res id="InfoPanel.info" src="installer/resources/readme.license.txt"/>
<!-- <res id="ProcessPanel.Spec.xml" src="installer/resources/ProcessPanel.Spec.xml"/> -->
<res id="shortcutSpec.xml" src="installer/resources/shortcutSpec.xml" />
+ <res id="XInfoPanel.info" src="installer/resources/start-i2p.txt" />
</resources>
<panels>
@@ -94,6 +95,7 @@
<panel classname="InstallPanel"/>
<panel classname="ShortcutPanel"><os family="windows" /></panel>
<!-- <panel classname="ProcessPanel"><os family="windows" /></panel> -->
+ <panel classname="XInfoPanel" ><os family="unix|mac" /></panel>
<panel classname="SimpleFinishPanel"/>
</panels>
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index d273d226e91b0430528860783a55387bffb8adb1..72daee17fdc2ff384c24a4945706f6c94f1ec6f5 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -74,6 +74,7 @@ rm -f ./lib/*.dll
rm -f ./*.bat
rm -f ./*.exe
rm -rf ./installer
-./i2prouter start
+# no, let's not start the router from the install script any more
+# ./i2prouter start
exit 0
diff --git a/installer/resources/start-i2p.txt b/installer/resources/start-i2p.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9da29e3948c20875a8f243091194f6bb8fffcd5e
--- /dev/null
+++ b/installer/resources/start-i2p.txt
@@ -0,0 +1 @@
+To start I2P, run "$INSTALL_PATH/i2prouter start"
diff --git a/readme_zh.html b/readme_zh.html
index bb7dc314a787b25f7f38ea9904dfe87e18c4a8cc..7e6d509efa3088cf91f0f37ee7a1b80493b69715 100644
--- a/readme_zh.html
+++ b/readme_zh.html
@@ -1,26 +1,26 @@
<p align=right><font size="-1"><a href="/index.jsp?lang=en">English</a> | <a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=fr">Français</a> | <a href="/index.jsp?lang=nl">Nederlands</a> | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
-<p>如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 "已共享客户"("shared clients") 的本地目标。(如果没有,请见 <a href="#trouble">疑难解答</a>)。待出现以上消息后，您可以:</p>
+<p>濡傛灉 I2P 宸茬粡杩愯锛屾湭鏉ョ殑鍑犲垎閽熼噷鎺у埗鍙板乏渚х殑娲诲姩鑺傜偣(Active)鏁伴噺灏嗗紑濮嬪闀匡紝骞朵細鍑虹幇鍚嶄负 "宸插叡浜鎴�"("shared clients") 鐨勬湰鍦扮洰鏍囥€�(濡傛灉娌℃湁,璇疯 <a href="#trouble">鐤戦毦瑙ｇ瓟</a>)銆傚緟鍑虹幇浠ヤ笂娑堟伅鍚庯紝鎮ㄥ彲浠�:</p>
<ul>
- <li><B>浏览 IIP网站 "eepsites"</B> - I2P 网络内匿名运行的站点 - 您要首先设置浏览器的 <B>HTTP 代理</B> 为 localhost:4444 然后才能浏览IIP站点 - <ul>
- <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> 和 <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: 这两个站点用于跟踪哪些 IIP 站点在线。</li>
- <li><a href="http://forum.i2p/">forum.i2p</a>: 安全匿名的访问I2P官方论坛 <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
- <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> 与其镜像 <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>: 安全匿名的访问I2P官网 <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
- <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: 匿名建立的IIP网站搜索引擎</li>
- <li><a href="http://ugha.i2p/">ugha.i2p</a>: UGHA 的IIP站点, 任何人都可以编辑的WIKI, 有丰富的链接</li>
- <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: FREENET 代理</li>
- </ul> I2P网络中还有很多其他的IIP网站(EEPSITE) - 访问上面的网站你会找到更多，收藏你喜爱的 IIP 网站，别忘了常去看看！</li>
- <li><B>浏览 Web 网页</B> - 目前 IP2 网络中只有一个 HTTP 出口代理("outproxy")挂接在你主机4444端口的HTTP代理上。- 只要将浏览器的代理设置指向为前面的地址(localhost:4444)，然后访问任何普通链接即可 - 您的HTTP请求将在 I2P 网络内部传递。</li>
- <li><B>文件交换</B> - 本机的其中一个内置 <a href="i2psnark/">端口</a> 中提供 <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> 客户端。</li>
- <li><B>匿名电邮</B> - POSTMAN 创建了兼容普通邮件客户端 (POP3 / SMTP)的邮件系统，该系统可以在 I2P 网络内部收发Email 也可以收发来自外部 Internet 的邮件！电邮账号请到 <a href="http://hq.postman.i2p/">hq.postman.i2p</a> 申请。我们将用于匿名POP3/SMTP的Web邮件客户端 <a href="/susimail/susimail">SUSIMail</a>, 集成在I2P中，并将其配置为使用POSTMAN 的邮件服务。</li>
- <li><B>匿名聊天</B> - 打开您的 IRC 客户端并链接至 <B>localhost:6668</B>。这样可以访问两个匿名的 IRC 服务器, 但无论你还是服务器都不知道其他人在哪里。</li>
- <li><B>匿名博客</B> - 请访问 <a href="http://syndie.i2p2.de/">Syndie</a></li>
- <li>以及其他服务。</li>
+ <li><B>娴忚 IIP缃戠珯 "eepsites"</B> - I2P 缃戠粶鍐呭尶鍚嶈繍琛岀殑绔欑偣 - 鎮ㄨ棣栧厛璁剧疆娴忚鍣ㄧ殑 <B>HTTP 浠ｇ悊</B> 涓� localhost:4444 鐒跺悗鎵嶈兘娴忚IIP绔欑偣 - <ul>
+ <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> 鍜� <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: 杩欎袱涓珯鐐圭敤浜庤窡韪摢浜� IIP 绔欑偣鍦ㄧ嚎銆�</li>
+ <li><a href="http://forum.i2p/">forum.i2p</a>: 瀹夊叏鍖垮悕鐨勮闂甀2P瀹樻柟璁哄潧 <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+ <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> 涓庡叾闀滃儚 <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>: 瀹夊叏鍖垮悕鐨勮闂甀2P瀹樼綉 <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
+ <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: 鍖垮悕寤虹珛鐨処IP缃戠珯鎼滅储寮曟搸</li>
+ <li><a href="http://ugha.i2p/">ugha.i2p</a>: UGHA 鐨処IP绔欑偣, 浠讳綍浜洪兘鍙互缂栬緫鐨刉IKI, 鏈変赴瀵岀殑閾炬帴</li>
+ <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: FREENET 浠ｇ悊</li>
+ </ul> I2P缃戠粶涓繕鏈夊緢澶氬叾浠栫殑IIP缃戠珯(EEPSITE) - 璁块棶涓婇潰鐨勭綉绔欎綘浼氭壘鍒版洿澶氾紝鏀惰棌浣犲枩鐖辩殑 IIP 缃戠珯锛屽埆蹇樹簡甯稿幓鐪嬬湅锛�</li>
+ <li><B>娴忚 Web 缃戦〉</B> - 鐩墠 IP2 缃戠粶涓彧鏈変竴涓� HTTP 鍑哄彛浠ｇ悊("outproxy")鎸傛帴鍦ㄤ綘涓绘満4444绔彛鐨凥TTP浠ｇ悊涓娿€�- 鍙灏嗘祻瑙堝櫒鐨勪唬鐞嗚缃寚鍚戜负鍓嶉潰鐨勫湴鍧€(localhost:4444)锛岀劧鍚庤闂换浣曟櫘閫氶摼鎺ュ嵆鍙� - 鎮ㄧ殑HTTP璇锋眰灏嗗湪 I2P 缃戠粶鍐呴儴浼犻€掋€�</li>
+ <li><B>鏂囦欢浜ゆ崲</B> - 鏈満鐨勫叾涓竴涓唴缃� <a href="i2psnark/">绔彛</a> 涓彁渚� <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> 瀹㈡埛绔€�</li>
+ <li><B>鍖垮悕鐢甸偖</B> - POSTMAN 鍒涘缓浜嗗吋瀹规櫘閫氶偖浠跺鎴风 (POP3 / SMTP)鐨勯偖浠剁郴缁燂紝璇ョ郴缁熷彲浠ュ湪 I2P 缃戠粶鍐呴儴鏀跺彂Email 涔熷彲浠ユ敹鍙戞潵鑷閮� Internet 鐨勯偖浠讹紒鐢甸偖璐﹀彿璇峰埌 <a href="http://hq.postman.i2p/">hq.postman.i2p</a> 鐢宠銆傛垜浠皢鐢ㄤ簬鍖垮悕POP3/SMTP鐨刉eb閭欢瀹㈡埛绔� <a href="/susimail/susimail">SUSIMail</a>, 闆嗘垚鍦↖2P涓紝骞跺皢鍏堕厤缃负浣跨敤POSTMAN 鐨勯偖浠舵湇鍔°€�</li>
+ <li><B>鍖垮悕鑱婂ぉ</B> - 鎵撳紑鎮ㄧ殑 IRC 瀹㈡埛绔苟閾炬帴鑷� <B>localhost:6668</B>銆傝繖鏍峰彲浠ヨ闂袱涓尶鍚嶇殑 IRC 鏈嶅姟鍣�, 浣嗘棤璁轰綘杩樻槸鏈嶅姟鍣ㄩ兘涓嶇煡閬撳叾浠栦汉鍦ㄥ摢閲屻€�</li>
+ <li><B>鍖垮悕鍗氬</B> - 璇疯闂� <a href="http://syndie.i2p2.de/">Syndie</a></li>
+ <li>浠ュ強鍏朵粬鏈嶅姟銆�</li>
</ul>
-<h2>想创建属于您自己的 IIP 站点(EEPSITE)？</h2>
+<h2>鎯冲垱寤哄睘浜庢偍鑷繁鐨� IIP 绔欑偣(EEPSITE)锛�</h2>
-<p>我们已经集成了一些软件来帮助你运行自己的EEPSITE - 有一个<a href="http://jetty.mortbay.org/">Jetty</a> 实例监听于本机 <a href="http://localhost:7658/">http://localhost:7658/</a>上。只要将你的文件放在 <code>eepsite/docroot/</code> 文件夹中 (或将任何标准的 JSP/Servlet <code>.war</code> 文件放置于 <code>eepsite/webapps</code> 中, 标准的 CGI 脚本应置于 <code>eepsite/cgi-bin</code> 目录内) 之后就可以浏览啦。此后运行 <a href="/i2ptunnel/">IIP站点隧道(EEPSITE TUNEL)</a> 将其指向站点的端口, 您的站点就可以被他人看到了。当您创建IIP站点时的具体操作参见 <a href="http://localhost:7658/">您的临时EEPSITE页面</a>。</p>
+<p>鎴戜滑宸茬粡闆嗘垚浜嗕竴浜涜蒋浠舵潵甯姪浣犺繍琛岃嚜宸辩殑EEPSITE - 鏈変竴涓�<a href="http://jetty.mortbay.org/">Jetty</a> 瀹炰緥鐩戝惉浜庢湰鏈� <a href="http://localhost:7658/">http://localhost:7658/</a>涓娿€傚彧瑕佸皢浣犵殑鏂囦欢鏀惧湪 <code>eepsite/docroot/</code> 鏂囦欢澶逛腑 (鎴栧皢浠讳綍鏍囧噯鐨� JSP/Servlet <code>.war</code> 鏂囦欢鏀剧疆浜� <code>eepsite/webapps</code> 涓�, 鏍囧噯鐨� CGI 鑴氭湰搴旂疆浜� <code>eepsite/cgi-bin</code> 鐩綍鍐�) 涔嬪悗灏卞彲浠ユ祻瑙堝暒銆傛鍚庤繍琛� <a href="/i2ptunnel/">IIP绔欑偣闅ч亾(EEPSITE TUNEL)</a> 灏嗗叾鎸囧悜绔欑偣鐨勭鍙�, 鎮ㄧ殑绔欑偣灏卞彲浠ヨ浠栦汉鐪嬪埌浜嗐€傚綋鎮ㄥ垱寤篒IP绔欑偣鏃剁殑鍏蜂綋鎿嶄綔鍙傝 <a href="http://localhost:7658/">鎮ㄧ殑涓存椂EEPSITE椤甸潰</a>銆�</p>
-<h2><a name="trouble">疑难解答</a></h2>
+<h2><a name="trouble">鐤戦毦瑙ｇ瓟</a></h2>
-<p>保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点(Active:已连接/新近连接) 计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>)，检查您的浏览器代理设置是否为本地的 localhost:4444。你也可以查看 <a href="http://www.i2p2.i2p/">I2P 网站</a> 上的信息, 在 <a href="http://forum.i2p2.de/">I2P 论坛</a> 中发帖, 来 <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 两个IRC频道坐坐。 (这些服务器上的这两个频道是相通的)。</p>
+<p>淇濇寔鑰愬績 - I2P 绗竴娆″惎鍔ㄦ椂闇€瑕佹悳绱㈣妭鐐癸紝鍙兘姣旇緝缂撴參銆傚鏋�30鍒嗛挓鍚庯紝鎮ㄧ殑娲诲姩鑺傜偣(Active:宸茶繛鎺�/鏂拌繎杩炴帴) 璁℃暟浠嶅湪 10 涓妭鐐逛互涓�, 璇峰湪闃茬伀澧欎腑鎵撳紑 8887 绔彛鏀瑰杽杩炴帴鎬ц兘銆傚鏋滄偍鏍规湰鏃犳硶鎵撳紑浠讳綍EEPSITE(鐢氳嚦 <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>)锛屾鏌ユ偍鐨勬祻瑙堝櫒浠ｇ悊璁剧疆鏄惁涓烘湰鍦扮殑 localhost:4444銆備綘涔熷彲浠ユ煡鐪� <a href="http://www.i2p2.i2p/">I2P 缃戠珯</a> 涓婄殑淇℃伅, 鍦� <a href="http://forum.i2p2.de/">I2P 璁哄潧</a> 涓彂甯�, 鏉� <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> , irc.postman.i2p 鎴� irc.freshcoffee.i2p 涓婄殑 #i2p 鎴� #i2p-chat 涓や釜IRC棰戦亾鍧愬潗銆� (杩欎簺鏈嶅姟鍣ㄤ笂鐨勮繖涓や釜棰戦亾鏄浉閫氱殑)銆�</p>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 1440f81c074b5860a9c3b62a49546af04a8d5515..3e5e8985dd5771e110f3b6c0871a03c61fb5e850 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 = 10;
+ public final static long BUILD = 12;
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;