- tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'bug34077_043' into maint-0.4.3
by nickm＠torproject.org 05 May '20

05 May '20

commit 711385c47f93230aad049b2b7952d391a9114f68 Merge: 42507429c b1c383e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:45 2020 -0400 Merge branch 'bug34077_043' into maint-0.4.3 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tpo/master] Add new Tor Browser version 9.0.10
by sysrqb＠torproject.org 05 May '20

05 May '20

commit 892e053601460ce5104d434295b8729b2fa349d3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 5 14:01:47 2020 +0000 Add new Tor Browser version 9.0.10 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index e86ed14e..8e269a4c 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -17,6 +17,10 @@ body: "9.0.9-MacOS", "9.0.9-Linux", "9.0.9-Windows", +"9.0.10", +"9.0.10-MacOS", +"9.0.10-Linux", +"9.0.10-Windows", "9.5a8", "9.5a8-MacOS", "9.5a8-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 89863399..ec820b6b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.0.9 +version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha]

1 0

[onionperf/master] Fix tests for setting DataDirectoryGroupReadable.
by karsten＠torproject.org 05 May '20

05 May '20

commit 5ce7277436ca39853989081adbde0da95d7a138a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:33:17 2020 +0200 Fix tests for setting DataDirectoryGroupReadable. --- onionperf/tests/test_measurement.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/onionperf/tests/test_measurement.py b/onionperf/tests/test_measurement.py index 1898cbf..f577c61 100644 --- a/onionperf/tests/test_measurement.py +++ b/onionperf/tests/test_measurement.py @@ -32,7 +32,7 @@ def test_create_tor_config_env_var(): meas = measurement.Measurement(None, None, None, None, None, None, None, None, None) known_config = "UseBridges 1\nRunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\n" config_client = meas.create_tor_config(9001, 9050, "/tmp/", "client") config_server = meas.create_tor_config(9001, 9050, "/tmp/", "server") @@ -52,10 +52,10 @@ def test_create_tor_config_client_lines(): """ known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" meas = measurement.Measurement(None, None, None, None, None, None, "UseBridges 1\n", None, None) @@ -75,10 +75,10 @@ def test_create_tor_config_client_file(): """ known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" meas = measurement.Measurement(None, None, None, None, None, None, None, absolute_data_path("config"), None) @@ -98,10 +98,10 @@ def test_create_tor_config_server_file(): """ known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" meas = measurement.Measurement(None, None, None, None, None, None, None, None, absolute_data_path("config"))

1 0

[onionperf/master] Fix reprocessing mode test.
by karsten＠torproject.org 05 May '20

05 May '20

commit c8763fc024bcdf7bcefa33b0dbef91cc9df98d7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:42:12 2020 +0200 Fix reprocessing mode test. --- onionperf/tests/test_reprocessing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/tests/test_reprocessing.py b/onionperf/tests/test_reprocessing.py index ef800ab..76d5b4b 100644 --- a/onionperf/tests/test_reprocessing.py +++ b/onionperf/tests/test_reprocessing.py @@ -25,7 +25,7 @@ def test_log_collection_tgen(): def test_log_collection_torctl(): log_list = reprocessing.collect_logs(DATA_DIR, '*torctl.log') - well_known_list = [ DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log', DATA_DIR + 'logs/onionperf.torctl.log' ] + well_known_list = [ DATA_DIR + 'logs/onionperf.torctl.log', DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log' ] assert_equals(log_list, well_known_list ) def test_log_match():

1 0

[onionperf/master] Fix test for compressing logs during rotation.
by karsten＠torproject.org 05 May '20

05 May '20

commit 48ab3857f502f5bc0e68739e8a19fe9dcdca409f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:32:07 2020 +0200 Fix test for compressing logs during rotation. Still part of #33396. --- onionperf/tests/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/tests/test_utils.py b/onionperf/tests/test_utils.py index 940e0b6..71056ff 100644 --- a/onionperf/tests/test_utils.py +++ b/onionperf/tests/test_utils.py @@ -300,7 +300,7 @@ def test_file_writable_rotate_file(): test_writable.write("onionperf") test_writable.rotate_file(datetime.datetime(2018, 11, 27, 0, 0, 0)) created_dir = os.path.join(work_dir, "log_archive") - rotated_file = os.path.join(created_dir, "logfile_2018-11-27_00:00:00") + rotated_file = os.path.join(created_dir, "logfile_2018-11-27_00:00:00.gz") assert(os.path.exists(created_dir)) assert(os.path.isdir(created_dir)) assert(os.path.exists(rotated_file))

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 05 May '20

05 May '20

commit 6e452e6c436b343864b04d4e7e426a2ae37d9c4b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 5 06:15:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 92549acfcc..a1f5f9657b 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -1902,7 +1902,7 @@ msgstr "有人偷了信用卡信息后通常会捐款给非营利组织，以测 msgid "" "These people typically use a very small amount for their testing, and we've " "found that setting a $2 minimum donation seems to deter them." -msgstr "" +msgstr "这些人通常会先捐助一笔很少的资金来试一下，而我们发现2美元的最低捐增额度似乎有些吓着他们了。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:493 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:350 @@ -1931,13 +1931,13 @@ msgstr "如果我想匿名地捐款，用哪种方式最好？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:509 msgid "You can donate by sending us a postal money order." -msgstr "" +msgstr "您可以通过寄汇票的方式来给我们进行捐助。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:511 msgid "" "You can donate via bitcoin or another cryptocurrency if you have it set up " "in a way that preserves your anonymity." -msgstr "" +msgstr "您可以用比特币或其他密码币进行捐助，如果您将其设置成一种匿名支付方式的话。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:513 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:378 @@ -1968,6 +1968,7 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA." msgstr "" +"我们的邮政地址是Tor 项目, 217 First Avenue South #4903, Seattle WA 98194, USA。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:533 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:486 @@ -1976,13 +1977,13 @@ msgstr "你们接收现金捐款么？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:543 msgid "Can I donate via AmazonSmile?" -msgstr "" +msgstr "我能用AmazonSmile进行捐助吗？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:547 msgid "" "Amazon Smile is a website operated by Amazon with the same products, prices," " and shopping features as Amazon.com." -msgstr "" +msgstr "Amazon Smile是一个由亚马逊运营的网站，其产品，价格和购物特点都与亚马逊相同。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:549 #, php-format @@ -1991,16 +1992,19 @@ msgid "" "Foundation will donate 0.5% of the purchase price of eligible products to " "the charitable organization of your choice." msgstr "" +"二者的差别在于，当您在Amazon Smile上购物时，Amazon Smile基金会会捐出您所购买物品价格的0.5%，给您选中的慈善机构。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:553 msgid "" "<a href=\"https://smile.amazon.com/ch/20-8096820\" target=\"_blank\" " "class=\"hyperlinks links\">Set up the Tor Project on Amazon Smile</a>" msgstr "" +"<a href=\"https://smile.amazon.com/ch/20-8096820\" target=\"_blank\" " +"class=\"hyperlinks links\">在Amazon Smile上设置Tor 项目</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:559 msgid "Can I donate via Giving Assistant?" -msgstr "" +msgstr "我能通过Giving Assistant进行捐助吗？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:563 msgid ""

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 05 May '20

05 May '20

commit 0f5ab547ea39b26d4e4f5bbb3f1b507b4f587a8b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 5 05:45:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index de4baaeeae..92549acfcc 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -1709,6 +1709,8 @@ msgid "" " links\">torservers.net</a> is a German charitable non-profit that runs a " "wide variety of exit relays worldwide." msgstr "" +"<a href=\"https://www.torservers.net/\" target=\"_blank\" class=\"hyperlinks" +" links\">torservers.net</a>是一个在世界范围内运行多种出口节点的德国非盈利性慈善组织。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:391 msgid "They also like donations of bandwidth from ISPs." @@ -1721,6 +1723,9 @@ msgid "" "501(c)(3) non-profit that collects donations and turns them into more US-" "based exit relay capacity." msgstr "" +"<a href=\"https://www.noisebridge.net/wiki/Noisebridge_Tor\" " +"target=\"_blank\" class=\"hyperlinks " +"links\">Noisebridge</a>是一个基于美国的501(c)(3) 非盈利性组织，它募集捐款，用来增加基于美国的出口节点的服务容量。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:399 msgid "" @@ -1728,6 +1733,8 @@ msgid "" "links\">Nos Oignons</a> is a French charitable non-profit that runs fast " "exit relays in France." msgstr "" +"<a href=\"https://nos-oignons.net/\" target=\"_blank\" class=\"hyperlinks " +"links\">Nos Oignons</a>是一个在法国运行高速出口节点的法国非盈利性慈善组织。 " #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:403 msgid "" @@ -1735,6 +1742,8 @@ msgid "" "class=\"hyperlinks links\">DFRI</a> is a Swedish non-profit running exit " "relays." msgstr "" +"<a href=\"https://www.dfri.se/donera/?lang=en\" target=\"_blank\" " +"class=\"hyperlinks links\">DFRI</a>是一个运行出口节点的瑞典非盈利性组织。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:407 msgid "" @@ -1742,10 +1751,12 @@ msgid "" "target=\"_blank\" class=\"hyperlinks links\">The Tor Project, Inc</a>, but " "we consider that a good thing." msgstr "" +"这些组织和<a href=\"/%langcode%\" target=\"_blank\" class=\"hyperlinks " +"links\">Tor 项目</a>不是一回事，但我们认为他们的存在是一件好事。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:409 msgid "They're run by nice people who are part of the Tor community." -msgstr "" +msgstr "他们被一些同样来自Tor 大家庭的优秀人才运营着。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:415 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:276 @@ -1822,7 +1833,7 @@ msgstr "有一些用户遇到了故障，这是因为 PayPal 限制了某一 IP #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:447 msgid "This is to prevent fraud from card testers." -msgstr "" +msgstr "这是为了防止发生盗卡的行为。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:449 msgid "If you run into an issue, please try again." @@ -1832,7 +1843,7 @@ msgstr "如果您遇到了一些故障，请再次尝试。" msgid "" "Unfortunately, when we are receiving a high volume of donations, you might " "need to use a different browser." -msgstr "" +msgstr "不幸的是，当我们接收大额捐助时，您可能需要使用另一个浏览器。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:457 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:314 @@ -1845,6 +1856,8 @@ msgid "" "Discover or American Express) or via PayPal, please visit our <a " "class=\"hyperlinks links\" href=\"/%langcode%\">donate page</a>." msgstr "" +"要想使用主流信用卡或借记卡（VISA, MasterCard, Discover或American Express）或PayPal进行捐助, " +"请访问我们的<a class=\"hyperlinks links\" href=\"/%langcode%\">捐助页面</a>。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:467 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:324

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 05 May '20

05 May '20

commit 58147d5a6c12c8cf0a4d928df45b8022f1d212c9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 5 03:45:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 408943da4a..de4baaeeae 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -1507,6 +1507,8 @@ msgid "" "href=\"https://www.torproject.org/about/financials.html.en\">financial " "statements and its Form 990</a>." msgstr "" +"这里是Tor 项目的<a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/financials.html.en\">财务报告和它的990表格形式</a>。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:289 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:206 @@ -1527,6 +1529,8 @@ msgid "" "href=\"https://www.torproject.org/about/sponsors\">Sponsors Page</a> for " "more.)" msgstr "" +"（详情请见我们的<a class=\"hyperlinks links single-link\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/sponsors\">赞助商页面</a>。）" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:297 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:214 @@ -1623,7 +1627,7 @@ msgstr "" msgid "" "For European bank transfers, we have an arrangement with the Renewable " "Freedom Foundation to provide tax-deductible donations for Europeans." -msgstr "" +msgstr "我们与Renewable Freedom Foundation达成了协议，向欧洲银行的客户在捐助时提供税额抵扣。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:347 msgid "" @@ -1631,6 +1635,8 @@ msgid "" "href=\"https://renewablefreedom.org/contact/\" target=\"_blank\" " "class=\"hyperlinks links\">upon request</a>." msgstr "" +"他们会<a href=\"https://renewablefreedom.org/contact/\" target=\"_blank\" " +"class=\"hyperlinks links\">根据要求</a>开具一张捐赠收据。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349 msgid "The account information is as follows:" @@ -1645,6 +1651,12 @@ msgid "" " Rathausplatz 6 \n" " 85049 Ingolstadt" msgstr "" +"Renewable Freedom Foundation \n" +"IBAN: DE17721500000053693701 \n" +"BIC: BYLADEM1ING \n" +"Sparkasse Ingolstadt \n" +"Rathausplatz 6 \n" +"85049 Ingolstadt" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:365 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:264 @@ -1682,14 +1694,14 @@ msgid "" "If it's important to you that your donations be tax-deductible in a " "different country, let us know and we will try to offer tax-deductibility in" " your country in the future." -msgstr "" +msgstr "如果对您来说，在另一个国家的捐助时有税额抵扣很重要的话，请告知我们，我们会尽力日后在您的国家提供税额抵扣。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:385 msgid "" "Or, if you are in Germany, France, or Sweden, these organizations support " "the Tor network and may be able to offer you tax-deductibility for your " "donation." -msgstr "" +msgstr "或者，如果您身处德国，法国或瑞典这几个支持Tor 网络的国家，那么他们有可能向您的捐助提供税额抵扣。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:389 msgid ""

1 0

[snowflake/master] Reduce DataChannelTimeout from 30s to 10s.
by dcf＠torproject.org 05 May '20

05 May '20

commit 7043a055f9fb0680281ecffd7d458a43f2ce65b5 Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 1 10:49:40 2020 -0600 Reduce DataChannelTimeout from 30s to 10s. https://bugs.torproject.org/34042 --- client/lib/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 0076b79..91f7ecb 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -18,7 +18,7 @@ const ( ReconnectTimeout = 10 * time.Second SnowflakeTimeout = 30 * time.Second // How long to wait for the OnOpen callback on a DataChannel. - DataChannelTimeout = 30 * time.Second + DataChannelTimeout = 10 * time.Second ) type dummyAddr struct{}

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 04 May '20

04 May '20

commit 45ac96ab3a7b8809d6be300d6f6389f9e9e855bc Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 21:23:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+da.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+da.po b/contents+da.po index 8fb0967016..2a4ab46bce 100644 --- a/contents+da.po +++ b/contents+da.po @@ -1,7 +1,8 @@ +# # Translators: # Thomas Oberndörfer <thomas(a)mailvelope.com>, 2019 -# scootergrisen, 2020 # erinm, 2020 +# scootergrisen, 2020 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2020\n" +"Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7741,7 +7742,7 @@ msgstr "Støtte" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Community" -msgstr "" +msgstr "Fællesskab" #: https//support.torproject.org/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.title)

1 0