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

[chutney/master] TorNet: Fail bootstrap if times are incorrect
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 0fe4010bc3c3851239c3dec2800e0ce0899dcdc0 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 15:51:16 2020 +1000 TorNet: Fail bootstrap if times are incorrect If there is a time calculation bug, or a large clock skew, fail bootstrap. Diagnostics for macOS Travis hangs. --- lib/chutney/TorNet.py | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 9857968..efea40e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2212,6 +2212,7 @@ class Network(object): CHECK_NETWORK_STATUS_DELAY = 1.0 PRINT_NETWORK_STATUS_DELAY = V3_AUTH_VOTING_INTERVAL/2.0 + CHECKS_PER_PRINT = PRINT_NETWORK_STATUS_DELAY / CHECK_NETWORK_STATUS_DELAY def wait_for_bootstrap(self): print("Waiting for nodes to bootstrap...\n") @@ -2225,6 +2226,8 @@ class Network(object): wait_time_list = [c.getUncheckedDirInfoWaitTime() for c in controllers] wait_time = max(wait_time_list) + checks_since_last_print = 0 + most_recent_bootstrap_status = [ None ] * len(controllers) most_recent_desc_status = dict() while True: @@ -2290,12 +2293,46 @@ class Network(object): if now >= limit: break if now >= next_print_status: + if checks_since_last_print <= Network.CHECKS_PER_PRINT/2: + self.print_bootstrap_status(controllers, + most_recent_bootstrap_status, + most_recent_desc_status, + elapsed=elapsed, + msg="Internal timing error") + print("checks_since_last_print: {} (expected: {})" + .format(checks_since_last_print, + Network.CHECKS_PER_PRINT)) + print("start: {} limit: {}".format(start, limit)) + print("next_print_status: {} now: {}" + .format(next_print_status, time.time())) + return False + else: + self.print_bootstrap_status(controllers, + most_recent_bootstrap_status, + most_recent_desc_status, + elapsed=elapsed) + next_print_status = (now + + Network.PRINT_NETWORK_STATUS_DELAY) + checks_since_last_print = 0 + + time.sleep(Network.CHECK_NETWORK_STATUS_DELAY) + + # macOS Travis has some weird hangs, make sure we're not hanging + # in this loop due to clock skew + checks_since_last_print += 1 + if checks_since_last_print >= Network.CHECKS_PER_PRINT*2: self.print_bootstrap_status(controllers, most_recent_bootstrap_status, most_recent_desc_status, - elapsed=elapsed) - next_print_status = now + Network.PRINT_NETWORK_STATUS_DELAY - time.sleep(Network.CHECK_NETWORK_STATUS_DELAY) + elapsed=elapsed, + msg="Internal timing error") + print("checks_since_last_print: {} (expected: {})" + .format(checks_since_last_print, + Network.CHECKS_PER_PRINT)) + print("start: {} limit: {}".format(start, limit)) + print("next_print_status: {} now: {}" + .format(next_print_status, time.time())) + return False self.print_bootstrap_status(controllers, most_recent_bootstrap_status,

1 0

[chutney/master] TorNet: Fix display of dir info node lists
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 1eb79d4b837b72eeb8b280a3384a62eca77df8ce Author: teor <teor(a)torproject.org> Date: Mon Mar 16 15:47:58 2020 +1000 TorNet: Fix display of dir info node lists chutney was displaying any node set without directory authorities as "caches and clients". Now, chutney only displays "caches and clients" if the node set contains all caches and clients, and no dir auths. Bugfix on 33615. --- lib/chutney/TorNet.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index cd50412..73e21f4 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2151,6 +2151,7 @@ class Network(object): most_recent_desc_status, elapsed=None, msg="Bootstrap in progress"): + nick_set = set() cons_auth_nick_set = set() elapsed_msg = "" if elapsed: @@ -2162,6 +2163,7 @@ class Network(object): for c, boot_status in zip(controllers, most_recent_bootstrap_status): c.check(listRunning=False, listNonRunning=True) nick = c.getNick() + nick_set.add(nick) if c.getConsensusAuthority(): cons_auth_nick_set.add(nick) pct, kwd, bmsg = boot_status @@ -2172,15 +2174,19 @@ class Network(object): pct, kwd, bmsg)) + cache_client_nick_set = nick_set.difference(cons_auth_nick_set) print("Published dir info:") for c in controllers: nick = c.getNick() if nick in most_recent_desc_status: desc_status = most_recent_desc_status[nick] code, nodes, docs, dmsg = desc_status - if len(nodes) == len(self._nodes): + node_set = set(nodes) + if node_set == nick_set: nodes = "all nodes" - elif len(cons_auth_nick_set.intersection(nodes)) == 0: + elif node_set == cons_auth_nick_set: + nodes = "dir auths" + elif node_set == cache_client_nick_set: nodes = "caches and clients" else: nodes = [ node.replace("test", "")

1 0

[chutney/master] TorNet: Wrap a long line
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 9ffa2857fb4c6e75156159233263ac5898fc410c Author: teor <teor(a)torproject.org> Date: Mon Mar 16 15:58:24 2020 +1000 TorNet: Wrap a long line --- lib/chutney/TorNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index efea40e..ff20726 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2285,7 +2285,8 @@ class Network(object): if elapsed < min_time: sleep_time = min_time - elapsed print(("Waiting another {} seconds for legacy tor " - "microdesc downloads...\n").format(int(sleep_time))) + "microdesc downloads...\n") + .format(int(sleep_time))) time.sleep(sleep_time) now = time.time() elapsed = now - start

1 0

[chutney/master] TorNet: Recalculate elapsed time as needed
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit d0ac1c6f1a5346dd6aecca053fba1920632ef4dd Author: teor <teor(a)torproject.org> Date: Mon Mar 16 15:50:14 2020 +1000 TorNet: Recalculate elapsed time as needed chutney was calculating some elapsed times incorrectly, leading to longer wait times for network bootstrap. Bugfix on 33615. --- lib/chutney/TorNet.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 73e21f4..9857968 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2264,6 +2264,7 @@ class Network(object): print("Waiting {} seconds for other dir info to sync...\n" .format(int(wait_time))) time.sleep(wait_time) + now = time.time() elapsed = now - start # Wait for a minimum amount of run time, to avoid a race @@ -2283,6 +2284,7 @@ class Network(object): print(("Waiting another {} seconds for legacy tor " "microdesc downloads...\n").format(int(sleep_time))) time.sleep(sleep_time) + now = time.time() elapsed = now - start return True if now >= limit:

1 0

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

16 Mar '20

commit b0f5507c2353b221c37f076579b9ca1670e86ed7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 04:23:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 8f0f37bf31..adacadc68c 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -4009,7 +4009,7 @@ msgid "" "Otherwise, you could drop many packets during periods of maximum bandwidth " "usage - you may need to experiment with which values make your connection " "comfortable." -msgstr "" +msgstr "否则，你可能会在最大带宽使用时掉包——你可能需要试验一下哪些值使你的连接顺畅。" #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description) @@ -4130,7 +4130,7 @@ msgid "" "There are some cases where it doesn't seem to help: if an attacker can watch" " all of your incoming and outgoing traffic, then it's easy for them to learn" " which connections were relayed and which started at you." -msgstr "" +msgstr "有些情况下，它不能帮助我们：如果一个网络入侵者观看了你所有的来来往往的通信，那么他很容易发现哪些连接被转接了，哪些连接从你开始。" #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description)

1 0

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

16 Mar '20

commit 6bd0ce4c168a42ec063ec41fb309376f1ecc662b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 03:53:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f5159b954e..8f0f37bf31 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -13,6 +13,7 @@ # ff98sha, 2020 # Runzhe Liang <18051080098(a)163.com>, 2020 # ciaran <ciaranchen(a)qq.com>, 2020 +# 忻然李 <2544304894(a)qq.com>, 2020 # msgid "" msgstr "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-27 18:30+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: ciaran <ciaranchen(a)qq.com>, 2020\n" +"Last-Translator: 忻然李 <2544304894(a)qq.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4021,7 +4022,7 @@ msgid "" "Linux-based Tor nodes have another option at their disposal: they can " "prioritize Tor traffic below other traffic on their machine, so that their " "own personal traffic is not impacted by Tor load." -msgstr "" +msgstr "基于Linux系统的Tor节点提供了另外一种选择：他们会优先将Tor置于其他运行网络之下，因此他们的私人网络运作不会被Tor影响。" #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)

1 0

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

15 Mar '20

commit 4273ee393478f3b2b3207ff4297be0bcb0adb694 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 15 01:53:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 3327efb72c..8c62ce36b1 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -2978,6 +2978,10 @@ msgid "" "Internet is not flat, and it in fact does look different depending on where " "you are. This feature reminds people of this fact." msgstr "" +"Se você realmente que ver o Google em Inglês, você pode clicar no link que " +"fornece isso. Mas nós consideramos isto um recurso do Tor, não um bug - a " +"Internet não é plana, e de fato parece diferente dependendo onde você está. " +"Esse recurso lembra as pessoas desse fato. " #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) @@ -2991,7 +2995,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) msgid "https://encrypted.google.com/search?q=online%20anonymity&hl=en" -msgstr "" +msgstr "https://encrypted.google.com/search?q=online%20anonymity&hl=en" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) @@ -3131,6 +3135,8 @@ msgid "" "Cookie hijacking is possible by either physical access to your computer or " "by watching your network traffic." msgstr "" +"O sequestro de Cookie (Cookie hijacking) é possível através de acesso físico" +" ao seu computador assim como vigiando seu tráfego de rede. " #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 15 Mar '20

15 Mar '20

commit 651c0fd0a69ab4b277ec52834386e686b3e3b107 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 15 01:49:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+th.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+th.po b/contents+th.po index 32274b9480..52feb8afbb 100644 --- a/contents+th.po +++ b/contents+th.po @@ -864,7 +864,7 @@ msgid "" "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." msgstr "" -"ตัวส่งพรางการส่งข้อมูล ไม่ให้ถูกเซ็นเซอร์ได้ง่ายๆ แบบอื่นๆ เช่น meek " +"ตัวส่งพรางการส่งข้อมูล ไม่ให้ถูกเซ็นเซอร์ได้ง่ายๆ แบบอื่น เช่น meek " "ที่ใช้เทคนิคหลีกเลี่ยงการเซ็นเซอร์แบบอื่นที่ไม่ต้องใช้สะพาน " "คุณไม่จำเป็นต้องมีที่อยู่ของสะพานเพื่อใช้การส่งข้อมูลเหล่านี้"

1 0

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

15 Mar '20

commit 6de41da78914d1e3ebcd352168e018e36b2d9498 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 15 01:23:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index aa88ed8edd..3327efb72c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -2672,6 +2672,9 @@ msgid "" "the top-right of the screen), then clicking \"Advanced Security " "Settings...\"." msgstr "" +"Isto pode ser feito navegando pela ícone de Segurança (o pequeno escudo " +"cinza no topo direito da tela), então clicando \"Configurações avançadas de " +"segurança...\"." #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -2679,6 +2682,8 @@ msgid "" "The \"Standard\" level allows JavaScript, but the \"Safer\" and \"Safest\" " "levels both block JavaScript on HTTP sites." msgstr "" +"O nível \"padrão\" permite Javascript, mas os níveis \"seguro\" e \"mais " +"seguro\", ambos bloqueiam Javascript em sites HTTP." #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title) @@ -2797,6 +2802,9 @@ msgid "" "The simplest fix is to click on the Security icon (the small gray shield at " "the top-right of the screen), then click \"Advanced Security Settings...\"" msgstr "" +"A solução mais simples é clicar no ícone de segurança (o pequeno escudo " +"cinza no topo direito da tela), então clique \"Configurações avançadas de " +"segurança...\"" #: https//support.torproject.org/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.description) @@ -2845,6 +2853,8 @@ msgid "" "[Learn more about the design of Tor " "Browser](https://www.torproject.org/projects/torbrowser/design/)." msgstr "" +"[Aprenda mais sobre o design do Navegador Tor] " +"(https://www.torproject.org/projects/torbrowser/design/)" #: https//support.torproject.org/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.title) @@ -2863,6 +2873,9 @@ msgid "" "Browser](https://www.torproject.org/projects/torbrowser/design/#identifier-" "linkability) document further explains the thinking behind this design." msgstr "" +"[O design e implementação do Navegador Tor] " +"(https://www.torproject.org/projects/torbrowser/design/#identifier-" +"linkability) este documento explica o pensamento por trás desse design." #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.title) @@ -2884,6 +2897,8 @@ msgid "" "For a while now, Disconnect, which was formerly used in Tor Browser, has had" " no access to Google search results." msgstr "" +"Por enquanto, Desonectar, que foi anteriormente usado no Navegador Tor, " +"tinha acesso aos resultados de busca do Google" #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -2892,6 +2907,10 @@ msgid "" "choose between different search providers, it fell back to delivering Bing " "search results, which were basically unacceptable quality-wise." msgstr "" +"Uma vez que Desconectar é mais que um mecanismo de meta busca, o qual " +"permite que usuários escolham entre diferente provedores de busca, voltou a " +"fornecer resultados de busca do Bing, os quais eram basicamente inaceitáveis" +" em termos de qualidade." #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.title) @@ -2905,6 +2924,9 @@ msgid "" "Tor Browser is built using [Firefox ESR](https://www.mozilla.org/en-" "US/firefox/organizations/), so errors regarding Firefox may occur." msgstr "" +"O Navegador Tor é construído usando [Firefox ESR](https://www.mozilla.org" +"/en-US/firefox/organizations/), portanto erros em relação ao Firefox podem " +"ocorrer." #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.description) @@ -2925,11 +2947,15 @@ msgid "" "Browser](https://support.torproject.org/#tbb-10), it is common for anti-" "virus / anti-malware software to cause this type of issue." msgstr "" +"Se você está usando um antivirus, por favor veja [Minha proteção, " +"antivirus/malware está me bloqueando de acessar o Navegador " +"Tor](https://support.torproject.org/#tbb-10), É comum que programas de " +"antivirus / malware causem este tipo de problema." #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.title) msgid "Why does Google show up in foreign languages?" -msgstr "" +msgstr "Porque o Google aparece em línguas estrangeiras?" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 15 Mar '20

15 Mar '20

commit 4d5048a5487492ec71c6b4fc0fbff35f70388730 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 15 01:19:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+th.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contents+th.po b/contents+th.po index 5f8d663e92..32274b9480 100644 --- a/contents+th.po +++ b/contents+th.po @@ -11,6 +11,7 @@ # Emma Peel, 2019 # Kunanyaporn Jirasamatakij <kunanyaporn(a)gmail.com>, 2020 # bact' <arthit(a)gmail.com>, 2020 +# Darika Bamrungchok <darika(a)engagemedia.org>, 2020 # msgid "" msgstr "" @@ -18,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: bact' <arthit(a)gmail.com>, 2020\n" +"Last-Translator: Darika Bamrungchok <darika(a)engagemedia.org>, 2020\n" "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,7 +94,7 @@ msgstr "ใช้งาน Tor Browser เป็นครั้งแรก" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Pluggable transports" -msgstr "การขนส่งที่เสียบเข้าหากันได้" +msgstr "ตัวส่งพรางข้อมูล" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -863,9 +864,9 @@ msgid "" "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." msgstr "" -"การขนส่งที่เสียบกับช่องเสียบได้อื่น ๆ เช่น meek, " -"ใช้เทคนิคต่อต้านการเซ็นเซอร์ต่าง ๆ ที่ไม่ต้องใช้สะพาน " -"คุณไม่จำเป็นต้องได้รับที่อยู่ของสะพานเพื่อใช้การขนส่งเหล่านี้" +"ตัวส่งพรางการส่งข้อมูล ไม่ให้ถูกเซ็นเซอร์ได้ง่ายๆ แบบอื่นๆ เช่น meek " +"ที่ใช้เทคนิคหลีกเลี่ยงการเซ็นเซอร์แบบอื่นที่ไม่ต้องใช้สะพาน " +"คุณไม่จำเป็นต้องมีที่อยู่ของสะพานเพื่อใช้การส่งข้อมูลเหล่านี้" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0