November 2011 - tor-commits - lists.torproject.org

[tor/master] Disable IOCP and retry event_base_new_with_config once on failure
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 7be50c26e8b2ec0bd0121d5e8b2dc55de977cf5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 18:12:29 2011 -0500 Disable IOCP and retry event_base_new_with_config once on failure This is a fancier bug4457 workaround for 0.2.3. In 0.2.2, we could just tell Libevent "Don't enable locking!" so it wouldn't try to make the event_base notifiable. But for IOCP, we need a notifiable base. (Eventually, we'll want a notifiable base for other stuff, like multithreaded crypto.) So the solution is to try a full-featured initialization, and then retry with all the options turned off if that fails. --- changes/bug4457_master | 6 ++++++ src/common/compat_libevent.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/changes/bug4457_master b/changes/bug4457_master new file mode 100644 index 0000000..d394643 --- /dev/null +++ b/changes/bug4457_master @@ -0,0 +1,6 @@ + o Minor features: + - When we fail to initialize Libevent, retry with IOCP disabled so we + don't need to turn on multi-threading support in Libevent, which in + turn requires a working socketpair(). This is a workaround for bug + 4457, which affects Libevent versions from 2.0.1-alpha through + 2.0.15-stable. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index c533461..7a28c9b 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -195,7 +195,14 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) #ifdef HAVE_EVENT2_EVENT_H { - struct event_config *cfg = event_config_new(); + int attempts = 0; + int using_threads; + struct event_config *cfg; + + retry: + ++attempts; + using_threads = 0; + cfg = event_config_new(); tor_assert(cfg); #if defined(MS_WINDOWS) && defined(USE_BUFFEREVENTS) @@ -203,9 +210,18 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) evthread_use_windows_threads(); event_config_set_flag(cfg, EVENT_BASE_FLAG_STARTUP_IOCP); using_iocp_bufferevents = 1; + using_threads = 1; + } else { + using_iocp_bufferevents = 0; } #endif + if (!using_threads) { + /* Telling Libevent not to try to turn locking on can avoid a needless + * socketpair() attempt. */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_NOLOCK); + } + #if defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER >= V(2,0,7) if (torcfg->num_cpus > 0) event_config_set_num_cpus_hint(cfg, torcfg->num_cpus); @@ -220,6 +236,25 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) the_event_base = event_base_new_with_config(cfg); event_config_free(cfg); + + if (using_threads && the_event_base == NULL && attempts < 2) { + /* This could be a socketpair() failure, which can happen sometimes on + * windows boxes with obnoxious firewall rules. Downgrade and try + * again. */ +#if defined(MS_WINDOWS) && defined(USE_BUFFEREVENTS) + if (torcfg->disable_iocp == 0) { + log_warn(LD_GENERAL, "Unable to initialize Libevent. Trying again with " + "IOCP disabled."); + } else +#endif + { + log_warn(LD_GENERAL, "Unable to initialize Libevent. Trying again."); + } + + torcfg->disable_iocp = 1; + goto retry; + } + } #else the_event_base = event_init();

1 0

[tor/master] Merge branch 'bug4457_022' into maint-0.2.2
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 5a02406ae0d8059d3b0bbff51d37fcb92650274b Merge: 5bea660 0f6c021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 16:22:47 2011 -0500 Merge branch 'bug4457_022' into maint-0.2.2 changes/bug4457 | 9 +++++++++ src/common/compat_libevent.c | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 7363eae13cb8febd85923957de19e2de7c186cea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:46:43 2011 -0500 Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation In Tor 0.2.2, we never need the event base to be notifiable, since we don't call it from other threads. This is a workaround for bug 4457, which is not actually a Tor bug IMO. --- changes/bug4457 | 8 ++++++++ src/common/compat_libevent.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 new file mode 100644 index 0000000..d3d9eb3 --- /dev/null +++ b/changes/bug4457 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so + that it doesn't attempt to allocate a socketpair. This could cause + some problems on windows systems with overzealous firewalls. Fix for + bug 4457; workaround for Libevent versions 2.0.1-alpha through + 2.0.15-stable. + + diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 6d89be8..3e35e09 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -177,7 +177,18 @@ tor_libevent_initialize(void) #endif #ifdef HAVE_EVENT2_EVENT_H - the_event_base = event_base_new(); + { + struct event_config *cfg = event_config_new(); + + /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to + * turn it on can avoid a needless socketpair() attempt. + */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_NOLOCK); + + the_event_base = event_base_new_with_config(cfg); + + event_config_free(cfg); + } #else the_event_base = event_init(); #endif

1 0

[tor/maint-0.2.2] Detect failure from event_init() or event_base_new_with_config()
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 0f6c02161793fa1022fe721ed9c1aac3538294b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:53:45 2011 -0500 Detect failure from event_init() or event_base_new_with_config() --- changes/bug4457 | 1 + src/common/compat_libevent.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 index d3d9eb3..fe7c95f 100644 --- a/changes/bug4457 +++ b/changes/bug4457 @@ -5,4 +5,5 @@ bug 4457; workaround for Libevent versions 2.0.1-alpha through 2.0.15-stable. + - Detect failure to initialize Libevent. Better detection for bug 4457. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3e35e09..ddb2da6 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -179,6 +179,7 @@ tor_libevent_initialize(void) #ifdef HAVE_EVENT2_EVENT_H { struct event_config *cfg = event_config_new(); + tor_assert(cfg); /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to * turn it on can avoid a needless socketpair() attempt. @@ -193,6 +194,11 @@ tor_libevent_initialize(void) the_event_base = event_init(); #endif + if (!the_event_base) { + log_err(LD_GENERAL, "Unable to initialize Libevent: cannot continue."); + exit(1); + } + #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) /* Making this a NOTICE for now so we can link bugs to a libevent versions * or methods better. */

1 0

[tor/maint-0.2.2] Merge branch 'bug4457_022' into maint-0.2.2
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 5a02406ae0d8059d3b0bbff51d37fcb92650274b Merge: 5bea660 0f6c021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 16:22:47 2011 -0500 Merge branch 'bug4457_022' into maint-0.2.2 changes/bug4457 | 9 +++++++++ src/common/compat_libevent.c | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-)

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit c2345f4c80bf0a8b785406e85a02676a8210a8f6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 21:15:05 2011 +0000 Update translations for tsum --- zh/tsum.po | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 24a5d8c..5cb4966 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 20:37+0000\n" +"PO-Revision-Date: 2011-11-16 21:14+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -384,8 +384,8 @@ msgid "" "*Message Log* and select the *Advanced* tab. It may be that Tor won't " "connect because:" msgstr "" -"如果你的普通互联网连接运作正常，而 Tor 却无法连接到网络，请尝试以下步骤；打开 Vidalia 的设置面板，点击 *Message Log* 并选择" -" *Advanced* 标签页。Tor 无法连接到网络也许是因为：" +"如果你的普通互联网连接运作正常，而 Tor 却无法连接到网络，请尝试以下步骤；打开 Vidalia 的设置面板，点击 *消息日志* 并选择 *高级* " +"标签页。Tor 无法连接到网络也许是因为：" #. type: Plain text #: en/tsum.text:178 @@ -405,9 +405,8 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" -"**你受限于防火墙软件**：让 Tor 仅尝试 80 和 443 端口，打开 Vidalia 控制面板，点击 " -"*Settings*，*Network*，然后选中 *My firewall only lets me connect to certain " -"ports* 的选项框。\n" +"**你受限于防火墙软件**：让 Tor 仅尝试 80 和 443 端口，打开 Vidalia 控制面板，点击 *设置*，*网络*，然后选中 " +"*我的防火墙只允许我连接到指定端口* 的选项框。\n" #. type: Plain text #: en/tsum.text:187 @@ -471,17 +470,17 @@ msgstr "" msgid "" "The steps below assume you have a functional Tor/Vidalia configuration, and " "you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." -msgstr "" +msgstr "以下步骤假设你已有一套配置正确的 Tor/Vidalia ，并找到了一份 HTTPS、SOCKS4 或 SOCKS5 代理服务器的列表。" #. type: Bullet: '1. ' #: en/tsum.text:235 msgid "Open the Vidalia control panel, click on *Settings*." -msgstr "" +msgstr "打开 Vidalia 控制面板，点击 *设置*。" #. type: Bullet: '2. ' #: en/tsum.text:235 msgid "Click *Network*. Select *I use a proxy to access the Internet*." -msgstr "" +msgstr "点击 *网络*，选择 *我使用代理服务器连接到网络*。" #. type: Plain text #: en/tsum.text:235 @@ -497,6 +496,11 @@ msgid "" "7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" "proxy to access the rest of the Tor network.\n" msgstr "" +"3. 在 *Address* 一栏里填上代理服务器的地址，这可以是主机名或IP地址。\n" +"4. 填上代理服务器的端口。\n" +"5. 一般来说，你并不需要用户名和密码。如果需要，则也相应地填上。\n" +"6. 选择你在使用的代理服务器的 *Type*，可以是 HTTP/HTTPS，SOCKS4 或 SOCKS5。\n" +"7. 点击 *OK* 按钮。Vidalia 和 Tor 现已成功配置为使用代理服务器连接到 Tor 网络。\n" #. type: Plain text #: en/tsum.text:240 @@ -582,6 +586,9 @@ msgid "" "case, you will need to close the old Vidalia and Tor before you can run\n" "this one.\n" msgstr "" +"**Vidalia 和 Tor 已在运行**：\n" +"举个例子，假如你已安装过 Vidalia 软件包而你现在正尝试运行 Tor 浏览器软件包，这种情况就有可能发生。\n" +"这样的话你将需要先关闭旧版的 Vidalia 和 Tor。\n" #. type: Plain text #: en/tsum.text:294 @@ -594,6 +601,11 @@ msgid "" "is unable to restart Tor for you; go into your process or task manager,\n" "and terminate the Tor process. Then use Vidalia to restart Tor.\n" msgstr "" +"**Vidalia 崩溃了，但 Tor 仍在运行**：\n" +"如果提示输入控制密码的对话框里有一个“重置”按钮，\n" +"你可以点击该按钮，Vidalia 会以一个新的随机控制密码重启 Tor。\n" +"如果你没有看到“重置”按钮，或者 Vidalia 无法重启 Tor，\n" +"请前往你的进程或任务管理器，终止 Tor 的进程。然后再用 Vidalia 来重启 Tor。\n" #. type: Plain text #: en/tsum.text:298 @@ -602,6 +614,8 @@ msgid "" "[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " "Project website." msgstr "" +"要了解更多，请参阅 Tor Project 网站上的 " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword)。" #. type: Plain text #: en/tsum.text:303

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit efa4ebbdb4fe251613ec6365501f876c4ac3e42d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 20:45:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 4dc70ad..24a5d8c 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 20:13+0000\n" +"PO-Revision-Date: 2011-11-16 20:37+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -357,6 +357,9 @@ msgid "" "[https://check.torproject.org/](https://check.torproject.org/). You can now " "browse the Internet through Tor." msgstr "" +"当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor " +"网络。之后你会看到一个浏览器显示出[https://check.torproject.org/](https://check.torproject.o…" +" Tor。现在你可以开始通过 Tor 来浏览互联网了。" #. type: Plain text #: en/tsum.text:163 @@ -364,7 +367,7 @@ msgstr "" msgid "" "*Please note that it is important that you use the browser that comes\n" "with the bundle, and not your own browser.*\n" -msgstr "" +msgstr "*请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这至关重要。*\n" #. type: Plain text #: en/tsum.text:169 @@ -381,6 +384,8 @@ msgid "" "*Message Log* and select the *Advanced* tab. It may be that Tor won't " "connect because:" msgstr "" +"如果你的普通互联网连接运作正常，而 Tor 却无法连接到网络，请尝试以下步骤；打开 Vidalia 的设置面板，点击 *Message Log* 并选择" +" *Advanced* 标签页。Tor 无法连接到网络也许是因为：" #. type: Plain text #: en/tsum.text:178 @@ -389,7 +394,7 @@ msgid "" "**Your system clock is off**: Make sure that the date and time on your\n" "system is correct, and restart Tor. You may need to synchronize your\n" "system clock with an Internet time server. \n" -msgstr "" +msgstr "**你的系统时钟不准确**：请确保你的系统中的日期与时间正确，然后重启 Tor。你也许需要把系统时钟与某台网络时间服务器进行同步。\n" #. type: Plain text #: en/tsum.text:183 @@ -400,6 +405,9 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" +"**你受限于防火墙软件**：让 Tor 仅尝试 80 和 443 端口，打开 Vidalia 控制面板，点击 " +"*Settings*，*Network*，然后选中 *My firewall only lets me connect to certain " +"ports* 的选项框。\n" #. type: Plain text #: en/tsum.text:187 @@ -408,7 +416,7 @@ msgid "" "**Your anti-virus program is blocking Tor**: Make sure that your\n" "anti-virus program is not preventing Tor from making network\n" "connections.\n" -msgstr "" +msgstr "**你的反病毒软件正在阻挡 Tor**：请确保你的反病毒软件没有阻止 Tor 进行网络连接。\n" #. type: Plain text #: en/tsum.text:191 @@ -417,6 +425,8 @@ msgid "" "(ISP) is blocking Tor. Very often this can be worked around with **Tor " "bridges**, hidden relays that aren't as easy to block." msgstr "" +"如果 Tor 仍然不能工作，那么可能是你的互联网服务提供商（ISP）正在阻挡 Tor。这通常可以使用 **Tor " +"桥接**，不易被阻挡的隐蔽中继服务器，来绕开阻挡。" #. type: Plain text #: en/tsum.text:195 @@ -440,6 +450,7 @@ msgid "" "guarantee that the bridge you are using now will work tomorrow, so you " "should make a habit of updating your list of bridges every so often." msgstr "" +"配置一个以上的桥接地址，能让 Tor 的连接在某些桥接无法访问时更加稳定。你无法保证今天能使用的桥接明天仍然能用，所以你应该养成时常更新桥接列表的习惯。" #. type: Plain text #: en/tsum.text:214

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 64a6d0ceaedea775115c025da604181e9e0f9922 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 20:15:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 41e553f..4dc70ad 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 18:58+0000\n" +"PO-Revision-Date: 2011-11-16 20:13+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -113,8 +113,9 @@ msgid "" "and requires no installation. You download the bundle, extract the archive, " "and start Tor." msgstr "" -"我们向大多数用户推荐 [Tor 浏览器软件包](https://www.torproject.org/projects/torbrowser.html)" -" 。此软件包内含一个预先配置好的浏览器，用于透过 Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" +"我们向大多数用户推荐 [Tor " +"浏览器软件包](https://www.torproject.org/projects/torbrowser.html)。此软件包内含一个预先配置好的…" +" Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" #. type: Plain text #: en/tsum.text:48 @@ -138,13 +139,15 @@ msgid "" "**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " "**linux-x86_64** for 64-bit systems)." msgstr "" +"你也可以索要 Tor 浏览器软件包的 Mac OS X 版本（写上**“macos-i386”**），和 Linux " +"版本（写上**“linux-i386”**注明32位系统或**“linux-x86_64”**注明64位系统）" #. type: Plain text #: en/tsum.text:61 msgid "" "If you want a translated version of Tor, write **help** instead. You will " "then receive an email with instructions and a list of available languages." -msgstr "" +msgstr "如果你想要其它语言版本的 Tor 软件，请写上 **help**。你将收到一封电子邮件，内含指引以及现有的语言版本的列表。" #. type: Plain text #: en/tsum.text:67 @@ -217,6 +220,8 @@ msgid "" "will allow you to verify the file you've downloaded is exactly the one that " "we intended you to get." msgstr "" +"你将获取到的，还有一个与软件包的文件名相同、扩展名为 **.asc** 的文件。这个 .asc 文件是一个 GPG " +"签名，它能允许你校验你下载到的文件是否与你想要下载的完全一致。" #. type: Plain text #: en/tsum.text:105 @@ -224,7 +229,7 @@ msgstr "" msgid "" "Before you can verify the signature, you will have to download and\n" "install GnuPG: \n" -msgstr "" +msgstr "在校验签名之前，你将需要下载和安装 GnuPG：\n" #. type: Plain text #: en/tsum.text:109 @@ -234,42 +239,49 @@ msgid "" "**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" "**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" msgstr "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: 大多数 Linux 发行版已预装 GnuPG\n" #. type: Plain text #: en/tsum.text:112 msgid "" "Please note that you may need to edit the paths and the commands used below " "to get it to work on your system." -msgstr "" +msgstr "请注意，你将需要编辑以下使用到的路径和命令，让它们能在你的系统中运行。" #. type: Plain text #: en/tsum.text:115 msgid "" "Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " "Erinn's key, run:" -msgstr "" +msgstr "Tor 浏览器软件由 Erinn Clark 使用密钥 0x63FEE659 签署。要导入 Erinn 的密钥，请执行：" #. type: Plain text #: en/tsum.text:117 #, no-wrap msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --keyserver " +"hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" #. type: Plain text #: en/tsum.text:119 msgid "After importing the key, verify that the fingerprint is correct:" -msgstr "" +msgstr "导入密钥之后，校验指纹是否正确：" #. type: Plain text #: en/tsum.text:121 #, no-wrap msgid "\tgpg --fingerprint 0x63FEE659\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --fingerprint " +"0x63FEE659\n" #. type: Plain text #: en/tsum.text:123 msgid "You should see:" -msgstr "" +msgstr "你应该会看到：" #. type: Plain text #: en/tsum.text:130 @@ -282,13 +294,19 @@ msgid "" "\tuid Erinn Clark <erinn(a)double-helix.org>\n" "\tsub 2048R/EB399FD7 2003-10-16\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>pub 2048R/63FEE659 2003-10-16\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span> Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)torproject.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)debian.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)double-helix.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>sub 2048R/EB399FD7 2003-10-16\n" #. type: Plain text #: en/tsum.text:132 msgid "" "To verify the signature of the package you downloaded, run the following " "command:" -msgstr "" +msgstr "要校验你所下载到的软件包，请执行以下命令：" #. type: Plain text #: en/tsum.text:134 @@ -297,6 +315,8 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --verify tor-" +"browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe\n" #. type: Plain text #: en/tsum.text:140 @@ -317,6 +337,9 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" +"当你已完成校验并看到 *\"Good signature\"* 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 **tor-" +"browser_en-US** 这样的文件夹。这个文件夹里有另一个名为 **Docs** 的文件夹，内含一个 **changelog** 文件。请确保 " +"changelog 里第一行的版本号与文件名中的版本号相符。" #. type: Plain text #: en/tsum.text:153

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 36ccac180cc13f0a7c469921f94a5994189fda59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 19:15:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 1d0abe8..41e553f 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 18:15+0000\n" +"PO-Revision-Date: 2011-11-16 18:58+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -59,11 +59,13 @@ msgid "" "three random servers (also known as *relays*) in the Tor network, before the" " traffic is sent out onto the public Internet." msgstr "" +"Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络通讯被发送至公共互联网之前，Tor 会先把它们经由 Tor " +"网络中的三台随机服务器（也称为*“中继”*）传送。" #. type: Plain text #: en/tsum.text:21 msgid "![How Tor Works](images/how-tor-works.png)" -msgstr "" +msgstr "![Tor 的工作原理](images/how-tor-works.png)" #. type: Plain text #: en/tsum.text:26 @@ -81,6 +83,8 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" +"Tor 会把你的通讯来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的通讯加密，但不能加密 Tor " +"网络与最终目的地之间的通讯。" #. type: Plain text #: en/tsum.text:36 @@ -97,6 +101,8 @@ msgid "" "How to download Tor\n" "-------------------\n" msgstr "" +"如何下载 Tor\n" +"-------------------\n" #. type: Plain text #: en/tsum.text:44 @@ -107,6 +113,8 @@ msgid "" "and requires no installation. You download the bundle, extract the archive, " "and start Tor." msgstr "" +"我们向大多数用户推荐 [Tor 浏览器软件包](https://www.torproject.org/projects/torbrowser.html)" +" 。此软件包内含一个预先配置好的浏览器，用于透过 Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" #. type: Plain text #: en/tsum.text:48

1 0

r25225: {website} join the 'stop censorship' campaign for the day (but put the (in website/trunk: en images)
by Roger Dingledine 16 Nov '11

16 Nov '11

Author: arma Date: 2011-11-16 19:06:49 +0000 (Wed, 16 Nov 2011) New Revision: 25225 Added: website/trunk/images/stop-censorship-small.png Modified: website/trunk/en/index.wml Log: join the 'stop censorship' campaign for the day (but put their image on our website, rather than sending them a list of all our users for the day) Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-11-16 17:32:25 UTC (rev 25224) +++ website/trunk/en/index.wml 2011-11-16 19:06:49 UTC (rev 25225) @@ -147,7 +147,9 @@  </div>  - + +<a style="width:200px;height:100px;vertical-align:middle;text-align:center;background-color:#000;position:absolute;z-index:5555;top:10px;left:150px;background-image:url(/images/stop-censorship-small.png);background-position:center center;background-repeat:no-repeat;" href="http://americancensorship.org"></a> + <div id="sidecol"> <div id="torusers"> <h2>Who Uses Tor?</h2> Added: website/trunk/images/stop-censorship-small.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/stop-censorship-small.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0