April 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.0'
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 974c2674ebb8fb6716cc147e04eff6058094565f Merge: 811a93f80 a39789a02 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:47:07 2019 +0300 Merge branch 'maint-0.4.0' changes/bug30001 | 7 +++++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] 30001: Fix a race condition in test_dir_handle_get.c
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 367dd9cf0226c087d49225a20415e9a199d2d71f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 10:16:18 2019 -0400 30001: Fix a race condition in test_dir_handle_get.c Previously we used time(NULL) to set the Expires: header in our HTTP responses. This made the actual contents of that header untestable, since the unit tests have no good way to override time(), or to see what time() was at the exact moment of the call to time() in dircache.c. This gave us a race in dir_handle_get/status_vote_next_bandwidth, where the time() call in dircache.c got one value, and the call in the tests got another value. I'm applying our regular solution here: using approx_time() so that the value stays the same between the code and the test. Since approx_time() is updated on every event callback, we shouldn't be losing any accuracy here. Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any released Tor. --- changes/bug30001 | 4 ++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug30001 b/changes/bug30001 new file mode 100644 index 000000000..e3304701e --- /dev/null +++ b/changes/bug30001 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Use the approx_time() function when setting the "Expires" header + in directory replies, to make them more testable. Needed for + ticket 30001. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..1123d034e 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length, long cache_lifetime) { char date[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); buf_t *buf = buf_new_with_capacity(1024); tor_assert(conn); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c3a17e730..e57bd0258 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) /* Check cache lifetime */ char expbuf[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ format_rfc1123_time(expbuf, (time_t)(now + 30*60)); char *expires = NULL;

1 0

[tor/release-0.4.0] changes: update the changes file for 30001
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 12:34:33 2019 +1000 changes: update the changes file for 30001 --- changes/bug30001 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug30001 b/changes/bug30001 index e3304701e..52e58872e 100644 --- a/changes/bug30001 +++ b/changes/bug30001 @@ -2,3 +2,6 @@ - Use the approx_time() function when setting the "Expires" header in directory replies, to make them more testable. Needed for ticket 30001. + o Minor bug fixes (testing): + - Check the time in the "Expires" header with approx_time(). + Fixes bug 30001; bugfix on 0.4.0.4-rc.

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/960' into maint-0.4.0
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc Merge: 24b68b477 37d7daa3c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:46:45 2019 +0300 Merge branch 'tor-github/pr/960' into maint-0.4.0 changes/bug30001 | 7 +++++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 88d6c2568d4a1ccc6fd3865e95bfb5243bf90395 Merge: e8b26bb71 a39789a02 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:47:07 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug30001 | 7 +++++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit ccffaedfcc9031b360a1faa277db18b8646524bf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 12:50:37 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 73 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f43fc3287..178691778 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -479,15 +479,15 @@ msgstr "讨论运行一个Tor中继" #: templates/contact.html:14 msgid "Talk with Tor's global south community." -msgstr "" +msgstr "与Tor的全球南方社区交谈。" #: templates/contact.html:20 msgid "Find us on Social Media" -msgstr "" +msgstr "在社交媒体上找到我们" #: templates/contact.html:34 msgid "Volunteer with Tor" -msgstr "" +msgstr "Tor志愿者" #: templates/contact.html:38 msgid "Get Involved" @@ -495,7 +495,7 @@ msgstr "入门指南" #: templates/contact.html:44 msgid "Join an email list" -msgstr "" +msgstr "加入邮件列表" #: templates/contact.html:47 msgid "" @@ -504,31 +504,33 @@ msgid "" "our support portal, you can ask the appropriate list. You're welcome to " "subscribe and just watch, too :)" msgstr "" +"我们的团队在开放渠道，包括电子邮件列表中进行协作，欢迎你的加入。如果你对我们的特定团队有疑问，且在我们的支持门户网站上未回答，您可以询问相应的列表。 " +"欢迎您订阅并观看:)" #: templates/contact.html:60 msgid "Report a bug or give feedback." -msgstr "" +msgstr "报告缺陷或提交反馈" #: templates/contact.html:61 msgid "" "Tor relies on the support of users and volunteers around the world to help " "us improve our software and resources, so your feedback is extremely " "valuable to us (and to all Tor users)." -msgstr "" +msgstr "Tor依靠全球用户和志愿者的支持来帮助我们改进我们的软件和资源，因此您的反馈对我们（以及所有Tor用户）都非常有价值。" #: templates/contact.html:67 msgid "Tell us about a bad relay." -msgstr "" +msgstr "告知我们关于损坏的中继" #: templates/contact.html:68 msgid "" "If you find a relay that you think is malicious, misconfigured, or otherwise" " broken, please check out our wiki page and blog post on how to report it." -msgstr "" +msgstr "如果你发现了一个你认为是恶意的，配置错误的或者其他损坏的中继，请查看我们的维基页面和博客文章来了解如何报告它。" #: templates/contact.html:76 msgid "Report a security issue." -msgstr "" +msgstr "报告安全问题" #: templates/contact.html:77 msgid "" @@ -538,10 +540,13 @@ msgid "" "contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-" "keyservers.net. Here is the fingerprint:" msgstr "" +"如果您在我们的项目或基础架构中发现了安全问题，请发送电子邮件至tor-security(a)lists.torproject.org. " +"如果你需要加密你的邮件，你可以通过联系tor-security-sendkey(a)lists.torproject.xn--orgpool-b64k564l.sks-" +"keyservers.net获取列表的GPG公钥。这里是指纹：" #: templates/contact.html:97 msgid "Email us" -msgstr "" +msgstr "给我们发邮件" #: templates/contact.html:98 msgid "" @@ -553,15 +558,15 @@ msgstr "" #: templates/contact.html:104 msgid "Send us Mail" -msgstr "" +msgstr "给我们发邮件" #: templates/download-android.html:12 msgid "Get Tor Browser for Android." -msgstr "" +msgstr "获得安卓上的Tor Browser。" #: templates/download-android.html:15 templates/hero-download.html:5 msgid "Protect yourself against tracking, surveillance, and censorship." -msgstr "" +msgstr "在追踪，监视和审查中保护你自己。" #: templates/download-android.html:20 templates/download-android.html:22 msgid "Download .apk" @@ -578,7 +583,7 @@ msgstr "" #: templates/download-android.html:35 msgid "Are you a iOS user? We encourage you to try Onion Browser." -msgstr "" +msgstr "你是iOS用户吗？我们鼓励你尝试Onion Browser。" #: templates/download-languages.html:11 templates/download-options.html:11 msgid "Language" @@ -596,45 +601,45 @@ msgstr "" msgid "" "If you are in a country where Tor is blocked, you can configure Tor to " "connect to a bridge during the setup process." -msgstr "" +msgstr "如果你在一个Tor被屏蔽的国家里，你可以在安装过程中配置Tor来连接到网桥" #: templates/download.html:10 msgid "Select \"Tor is censored in my country.\"" -msgstr "" +msgstr "选择“我所在国家对 Tor 进行了封锁”" #: templates/download.html:13 msgid "" "If Tor is not censored, one of the most common reasons Tor won't connect is " "an incorrect system clock. Please make sure it's set correctly." -msgstr "" +msgstr "如果Tor没有被封锁，一个Tor没有连接最常见的原因是不正确的系统时钟。请保证它是正确的设置。" #: templates/download.html:14 msgid "Support Portal" -msgstr "" +msgstr "支持门户" #: templates/download.html:14 msgid "Read other FAQ's at our Support Portal" -msgstr "" +msgstr "在我们的支持门户读到其他的常见问题" #: templates/download.html:19 templates/download.html:21 msgid "Stay safe" -msgstr "" +msgstr "保持安全" #: templates/download.html:23 msgid "Please do not torrent over Tor." -msgstr "" +msgstr "请不要在Tor中使用torrent。" #: templates/download.html:24 msgid "" "Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime," " and others: they can be manipulated into revealing your IP address." -msgstr "" +msgstr "Tor Browser会屏蔽浏览器插件如Flash，RealPlayer，Quicktime和其他：他们可以被操纵来暴露你的IP地址。" #: templates/download.html:27 msgid "" "We do not recommend installing additional add-ons or plugins into Tor " "Browser" -msgstr "" +msgstr "我们不推荐在Tor Browser中安装额外的拓展和插件" #: templates/download.html:28 msgid "" @@ -650,7 +655,7 @@ msgstr "" #: templates/download.html:49 msgid "Verify Tor Browser signature" -msgstr "" +msgstr "验证Tor Browser签名" #: templates/footer.html:9 templates/footer.html:13 #: templates/hero-home.html:13 templates/navbar.html:58 @@ -697,7 +702,7 @@ msgstr "商标保护、版权保护以及第三方使用规则可以在 %(link_t #: templates/hero-download.html:2 msgid "Defend yourself." -msgstr "" +msgstr "保护你自己" #: templates/hero-download.html:42 msgid "Download in another language or platform" @@ -726,11 +731,11 @@ msgstr "防止你被追踪和监视。避开网络审查。" #: templates/home.html:7 msgid "Block Trackers" -msgstr "" +msgstr "屏蔽追踪者" #: templates/home.html:11 msgid "BLOCK TRACKERS" -msgstr "" +msgstr "屏蔽追踪者" #: templates/home.html:12 msgid "" @@ -741,11 +746,11 @@ msgstr "" #: templates/home.html:24 msgid "Defend Against Surveillance" -msgstr "" +msgstr "防御监视" #: templates/home.html:28 msgid "DEFEND AGAINST SURVEILLANCE" -msgstr "" +msgstr "防御监视" #: templates/home.html:29 msgid "" @@ -785,7 +790,7 @@ msgstr "" #: templates/home.html:75 msgid "Browse Freely" -msgstr "" +msgstr "自由浏览" #: templates/home.html:79 msgid "BROWSE FREELY" @@ -795,11 +800,11 @@ msgstr "自由浏览" msgid "" "With Tor Browser, you are free to access sites your home network may have " "blocked." -msgstr "" +msgstr "使用Tor Browser，你可以自由地访问你原有网络可能已经屏蔽的网站。" #: templates/jobs.html:2 msgid "Current Openings" -msgstr "" +msgstr "近期开放" #: templates/jobs.html:13 msgid "" @@ -972,11 +977,11 @@ msgstr "" #: templates/thank-you.html:17 msgid "Run a relay to make the network faster and more decentralized." -msgstr "" +msgstr "运行一个中继来使网络更快和更去中心化" #: templates/thank-you.html:21 msgid "Use your skills to volunteer." -msgstr "" +msgstr "成为志愿者使用你的技能" #: templates/macros/downloads.html:47 msgid "tor browser manual"

1 0

[tor/master] Merge branch 'bug30189_035' into bug30189_041
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 358df18064d0389219e610cf9aa5b08bbd6a0ec8 Merge: 9ae267538 802ac8ad6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 14:27:32 2019 -0400 Merge branch 'bug30189_035' into bug30189_041 changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --cc src/lib/log/util_bug.h index 63c5309c9,2a4d68127..2e220b728 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@@ -99,22 -95,19 +99,22 @@@ #else /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ -#define tor_assert(expr) STMT_BEGIN \ +#define tor_assert(expr) tor_assertf(expr, NULL) + +#define tor_assertf(expr, fmt, ...) STMT_BEGIN \ if (ASSERT_PREDICT_LIKELY_(expr)) { \ } else { \ - tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ - tor_abort_(); \ + tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr, \ + fmt, ##__VA_ARGS__); \ - abort(); \ ++ tor_abort_(); \ } STMT_END #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ #define tor_assert_unreached() \ STMT_BEGIN { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \ - "line should be unreached"); \ + "line should be unreached", NULL); \ - abort(); \ + tor_abort_(); \ } STMT_END /* Non-fatal bug assertions. The "unreached" variants mean "this line should @@@ -240,12 -221,13 +240,14 @@@ #define tor_fragile_assert() tor_assert_nonfatal_unreached_once() void tor_assertion_failed_(const char *fname, unsigned int line, - const char *func, const char *expr); + const char *func, const char *expr, + const char *fmt, ...); void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, - int once); + int once, const char *fmt, ...); + void tor_abort_(void) ATTR_NORETURN; + #ifdef _WIN32 #define SHORT_FILE__ (tor_fix_source_file(__FILE__)) const char *tor_fix_source_file(const char *fname);

1 0

[tor/master] Merge branch 'tor-github/pr/953'
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 811a93f80333d0f31ea9a46d9a1606c8e4ef11da Merge: 6320b2988 358df1806 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:43:47 2019 +0300 Merge branch 'tor-github/pr/953' changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/master] Use a tor_abort_() wrapper in our util_bug.h macros
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 802ac8ad618a0674c26bb973a2277e07b20f8c7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 14:16:23 2019 -0400 Use a tor_abort_() wrapper in our util_bug.h macros Previously, our use of abort() would break anywhere that we didn't include stdlib.h. This was especially troublesome in case where tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that one seldom gets tested. As an alternative, we could have just made this header include stdlib.h. But that seems bloaty. Fixes bug 30189; bugfix on 0.3.4.1-alpha. --- changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changes/bug30189 b/changes/bug30189 new file mode 100644 index 000000000..f8c932a5f --- /dev/null +++ b/changes/bug30189 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, unusual configuration): + - Avoid failures when building with ALL_BUGS_ARE_FAILED due to + missing declarations of abort(), and prevent other such failures + in the future. Fixes bug 30189; bugfix on 0.3.4.1-alpha. diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index f42d2d2ab..c65a91ae9 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -19,6 +19,7 @@ #include "lib/string/printf.h" #include <string.h> +#include <stdlib.h> #ifdef TOR_UNIT_TESTS static void (*failed_assertion_cb)(void) = NULL; @@ -120,6 +121,19 @@ tor_bug_occurred_(const char *fname, unsigned int line, #endif } +/** + * Call the abort() function to kill the current process with a fatal + * error. + * + * (This is a separate function so that we declare it in util_bug.h without + * including stdlib in all the users of util_bug.h) + **/ +void +tor_abort_(void) +{ + abort(); +} + #ifdef _WIN32 /** Take a filename and return a pointer to its final element. This * function is called on __FILE__ to fix a MSVC nit where __FILE__ diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 18d40bbf3..2a4d68127 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -99,7 +99,7 @@ if (ASSERT_PREDICT_LIKELY_(expr)) { \ } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ - abort(); \ + tor_abort_(); \ } STMT_END #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ @@ -107,7 +107,7 @@ STMT_BEGIN { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \ "line should be unreached"); \ - abort(); \ + tor_abort_(); \ } STMT_END /* Non-fatal bug assertions. The "unreached" variants mean "this line should @@ -141,7 +141,7 @@ #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ - abort(), 1) \ + tor_abort_(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert_nonfatal_unreached() STMT_NIL @@ -226,6 +226,8 @@ void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, int once); +void tor_abort_(void) ATTR_NORETURN; + #ifdef _WIN32 #define SHORT_FILE__ (tor_fix_source_file(__FILE__)) const char *tor_fix_source_file(const char *fname);

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit e7b1f3cfc0a34db7deddbff3dcca93d74a692f4c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 12:20:46 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 36affec96..f43fc3287 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -259,6 +259,8 @@ msgid "" "Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " "onion routing project with Paul Syverson." msgstr "" +"在00年代，Roger Dingledine，一个应届[麻省理工大学(MIT)](https://web.mit.edu/)毕业生，开始与Paul " +"Syverson在NRL洋葱路由项目工作。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -268,6 +270,8 @@ msgid "" "stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " "joined the project soon after." msgstr "" +"为了区分NRL的这个原始的工作和在其他地方出现的洋葱路由工作，Roger把这个项目叫做Tor，这表示The Onion Routing。Nick " +"Mathewson，Roger的一个MIT同学，在不久后加入了这个项目。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -277,20 +281,21 @@ msgid "" "diverse interests and trust assumptions, and the software needed to be free " "and open to maximize transparency and separation." msgstr "" +"从20世纪90年代开始，洋葱路由被认为依赖于分布式网络。网络需要由具有不同利益和信任假设的实体运营，并且软件需要自由开放来最大化透明度和分离。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "That's why in October 2002 when the Tor network was initially deployed, its " "code was released under a free and open software license." -msgstr "" +msgstr "这就是为什么2002年10月最初部署Tor网络时，其代码是在免费开放的软件许可下发布的。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "By the end of 2003, the network had about a dozen volunteer nodes, mostly in" " the U.S., plus one in Germany." -msgstr "" +msgstr "截至2003年底，该网络有大约十二个志愿者节点，大多数在美国，还有一个在德国。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -307,7 +312,7 @@ msgid "" "In 2007, the organization began developing bridges to the Tor network to " "address censorship, such as the need to get around government firewalls, in " "order for its users to access the open web." -msgstr "" +msgstr "2007年，该组织开始与Tor网络建立网桥，以解决审查问题，例如需要绕过政府防火墙，以便其用户访问开放网络。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -317,6 +322,7 @@ msgid "" " use, so starting in 2005, development of tools beyond just the Tor proxy " "began." msgstr "" +"Tor开始在对隐私感兴趣的活动人员和精通技术的用户中越来越受欢迎，但对技术含量较低的人来说仍然很难使用，所以从2005年开始，除了Tor代理之外的工具开始开发。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -325,6 +331,8 @@ msgid "" "[2008](https://lists.torproject.org/pipermail/tor-" "talk/2008-January/007837.html)." msgstr "" +"Tor Browser的开发开始于[2008年](https://lists.torproject.org/pipermail/tor-" +"talk/2008-January/007837.html)。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -335,6 +343,8 @@ msgid "" " 2010. It not only protected people's identity online but also allowed them " "to access critical resources, social media, and websites which were blocked." msgstr "" +"随着Tor浏览器让日常互联网用户和社运认识更容易使用Tor，Tor在[阿拉伯之春](https://www.theguardian.com/us-" +"news/the-nsa-files)开始时成为了一种有效工具。它不仅保护了人们的在线身份，还允许他们访问被阻止的关键资源，社交媒体和网站。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -443,29 +453,29 @@ msgstr "" #: templates/contact.html:8 msgid "Chat with us on" -msgstr "" +msgstr "与我们交流在" #: templates/contact.html:9 msgid "Ask questions about using Tor." -msgstr "" +msgstr "询问关于使用Tor的问题" #: templates/contact.html:10 msgid "Discuss Tor-related coding and protocols. Ideas are welcome." -msgstr "" +msgstr "讨论Tor相关的编码和协议。欢迎提出看法。" #: templates/contact.html:11 msgid "" "Discuss organization and community related topics: meetups, outreach, " "translation, or website improvements." -msgstr "" +msgstr "讨论组织和社区相关主题：聚会，推广，翻译或网站改进。" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." -msgstr "" +msgstr "公开地观看或加入记录的团队会议。" #: templates/contact.html:13 msgid "Discuss running a Tor relay." -msgstr "" +msgstr "讨论运行一个Tor中继" #: templates/contact.html:14 msgid "Talk with Tor's global south community."

1 0