March 2020 - tor-commits - lists.torproject.org

[chutney/master] test-network: Wait a few seconds between attempts
by teor＠torproject.org 12 Mar '20

12 Mar '20

commit 363038e37d84043b005993906345c789a066709b Author: teor <teor(a)torproject.org> Date: Thu Mar 12 20:16:18 2020 +1000 test-network: Wait a few seconds between attempts We want to make sure tor has fully exited, and the OS has reclaimed its resources. The pause helps if the failure happened due to system load. Part of 33583. --- tools/test-network.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index 9d06027..71c3321 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -390,6 +390,11 @@ while [ "$n_attempts" -lt "$max_attempts" ]; do if test "$?" = 77; then exit 77 fi + # Wait a little while after failures + if [ "$n_attempts" -lt "$max_attempts" ]; then + $ECHO "==== Failed bootstrap attempt $n_attempts, trying again..." + sleep 6 + fi done $ECHO "Chutney failed $n_attempts bootstraps; we may have a problem here."

1 0

[chutney/master] Travis: Tolerate a small number of failures
by teor＠torproject.org 12 Mar '20

12 Mar '20

commit 02be4f3ad9024d96af6a8d049236bb39247ae2df Author: teor <teor(a)torproject.org> Date: Thu Mar 12 20:22:46 2020 +1000 Travis: Tolerate a small number of failures Set CHUTNEY_ALLOW_FAILURES to 2, so that CI tolerates a single failure during each test-network.sh run. Part of 33583. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b651e13..dcb65fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ env: ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are ## triggered by Ubuntu Xenial and Bionic. See #32722. - CHUTNEY_TOR_SANDBOX="0" + ## Tolerate a small number of failures in chutney jobs + - CHUTNEY_ALLOW_FAILURES="2" matrix: ## This matrix entry is required, but it doesn't actually create any jobs ## by itself. All jobs are created by matrix: include: entries

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 7a9c0ce0defbff9eba1eaa33809312801a83a970 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:51:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties index 73c25f9011..ff530575d9 100644 --- a/zh-CN/torbutton.properties +++ b/zh-CN/torbutton.properties @@ -61,7 +61,7 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -# onionServices.learnMore=Learn more +onionServices.learnMore=更多详情 onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败 onionServices.authPrompt.description=%S 需要您的私钥 onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 @@ -69,14 +69,14 @@ onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 onionServices.authPrompt.invalidKey=请输入一个合法的密钥（52位 base32 字符或44位 base64 字符） onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置 Tor -# onionServices.authPreferences.header=Onion Services Authentication -# onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -# onionServices.authPreferences.savedKeys=Saved Keys… -# onionServices.authPreferences.dialogTitle=Onion Service Keys -# onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -# onionServices.authPreferences.onionSite=Onionsite -# onionServices.authPreferences.onionKey=Key -# onionServices.authPreferences.remove=Remove -# onionServices.authPreferences.removeAll=Remove All -# onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -# onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.header=洋葱服务认证 +onionServices.authPreferences.overview=某些洋葱服务需要您在使用前用密钥（一种密码）进行身份认证。 +onionServices.authPreferences.savedKeys=已保存密钥... +onionServices.authPreferences.dialogTitle=洋葱服务密钥 +onionServices.authPreferences.dialogIntro=接下来的洋葱网站的密钥储存在您的电脑上 +onionServices.authPreferences.onionSite=洋葱站 +onionServices.authPreferences.onionKey=线图 +onionServices.authPreferences.remove=移除 +onionServices.authPreferences.removeAll=移除全部 +onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥 +onionServices.authPreferences.failedToRemoveKey=无法移除密钥

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit eb061f31f893006e5edf0a60e6303374ec7f37ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:51:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties index 1c9bbd138d..ff530575d9 100644 --- a/zh-CN/torbutton.properties +++ b/zh-CN/torbutton.properties @@ -78,5 +78,5 @@ onionServices.authPreferences.onionSite=洋葱站 onionServices.authPreferences.onionKey=线图 onionServices.authPreferences.remove=移除 onionServices.authPreferences.removeAll=移除全部 -onionServices.authPreferences.failedToGetKeys=无法从Tor索回密钥 +onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥 onionServices.authPreferences.failedToRemoveKey=无法移除密钥

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 574a24323f4972b10853e226ba17435fd122f379 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:46:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- zh_CN/https-everywhere.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 151e07c1a7..a3b64acc07 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -49,6 +49,12 @@ <!ENTITY https-everywhere.cancel.open_page "打开不安全页面"> <!ENTITY https-everywhere.cancel.http_once "仅打开该会话的不安全页面"> +<!ENTITY https-everywhere.onboarding.intro "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。"> +<!ENTITY https-everywhere.onboarding.header "在 3.9.2020 版本的改动"> +<!ENTITY https-everywhere.onboarding.details_one "优化 EASE 模式"> +<!ENTITY https-everywhere.onboarding.details_two "你可以将站点加入白名单，使它们不使用 HTTPS Everywhere"> +<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere 是一个 EFF 的项目"> + <!ENTITY https-everywhere.chrome.settings_for_this_site_header "此站点的设置"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "更改您的加密连接首选项"> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "当您浏览不同的网站时，您可以更改每个网站的首选项">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 0ef25b22073e7739ce1d7a7aef957e739f768e08 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:46:00 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- zh_CN/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index d1f4e074c8..a3b64acc07 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -51,9 +51,9 @@ <!ENTITY https-everywhere.onboarding.intro "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。"> <!ENTITY https-everywhere.onboarding.header "在 3.9.2020 版本的改动"> -<!ENTITY https-everywhere.onboarding.details_one "优化EASE模式"> -<!ENTITY https-everywhere.onboarding.details_two "You can now whitelist sites to disable in HTTPS Everywhere"> -<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere 是一个EFF的项目"> +<!ENTITY https-everywhere.onboarding.details_one "优化 EASE 模式"> +<!ENTITY https-everywhere.onboarding.details_two "你可以将站点加入白名单，使它们不使用 HTTPS Everywhere"> +<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere 是一个 EFF 的项目"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "此站点的设置"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "更改您的加密连接首选项">

1 0

[translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 5d1b2d4b938ceea94df3d38ac979938a9cb255da Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:22:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- zh-CN/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zh-CN/torlauncher.properties b/zh-CN/torlauncher.properties index ef2c93cfee..dbb5658e46 100644 --- a/zh-CN/torlauncher.properties +++ b/zh-CN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 启动器 @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 +torlauncher.onionauthdir_missing=Tor 的洋葱验证文件夹不存在，且无法被创建。 torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 37e93b1e0091778b7dc14688593b91bc15a28fca Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:22:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- zh-CN/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torlauncher.properties b/zh-CN/torlauncher.properties index 4f5e1d6812..dbb5658e46 100644 --- a/zh-CN/torlauncher.properties +++ b/zh-CN/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Tor 的洋葱验证文件夹不存在，且无法被创建。 torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S

1 0

[translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit efdf4f358348d6e1d4e6702e30958da0135bdbee Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:21:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torbutton.dtd b/zh-CN/torbutton.dtd index ee34da9e01..919e457ce1 100644 --- a/zh-CN/torbutton.dtd +++ b/zh-CN/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "打开洋葱服务客户端认证提示"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel ""> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "记住此密钥">

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit dd89f9f20f04a0c5928774ed97dc608db828f523 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 00:21:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torbutton.dtd b/zh-CN/torbutton.dtd index eae74093ba..919e457ce1 100644 --- a/zh-CN/torbutton.dtd +++ b/zh-CN/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "打开洋葱服务客户端认证提示"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "记住此密钥">

1 0