- tor-commits - lists.torproject.org

[sbws/master] Merge branch 'ticket28652_rebased'
by juga＠torproject.org 21 Mar '19

21 Mar '19

commit 0333fadc221baf17d429f55261842f9f6e09ba5b Merge: 692e1fa 969bfbb Author: juga0 <juga(a)riseup.net> Date: Thu Mar 21 22:04:43 2019 +0000 Merge branch 'ticket28652_rebased' sbws/core/scanner.py | 13 ++++++++ sbws/lib/heartbeat.py | 69 ++++++++++++++++++++++++++++++++++++++++ sbws/lib/relaylist.py | 7 ++++ tests/unit/lib/test_heartbeat.py | 23 ++++++++++++++ 4 files changed, 112 insertions(+)

1 0

[sbws/master] Bake more details into the heartbeat module and out of the main loop.
by juga＠torproject.org 21 Mar '19

21 Mar '19

commit 969bfbbfc32af87b424dbbff168f2f4992033326 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 21 19:48:44 2019 +0200 Bake more details into the heartbeat module and out of the main loop. --- sbws/core/scanner.py | 24 ++++++------ sbws/lib/heartbeat.py | 85 +++++++++++++++++++++++++--------------- tests/unit/lib/test_heartbeat.py | 22 ++++++----- 3 files changed, 78 insertions(+), 53 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index f6443e5..b05f6e2 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -33,7 +33,7 @@ import requests import random from .. import settings -from ..lib import heartbeat +from ..lib.heartbeat import Heartbeat rng = random.SystemRandom() log = logging.getLogger(__name__) @@ -479,12 +479,7 @@ def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, measured. """ - # Variable to count total progress in the last days: - # In case it is needed to see which relays are not being measured, - # store their fingerprint, not only their number. - measured_fp_set = set() - measured_percent = 0 - main_loop_tstart = time.monotonic() + hbeat = Heartbeat(conf.getpath('paths', 'state_fname')) # Set the time to wait for a thread to finish as the half of an HTTP # request timeout. @@ -496,6 +491,10 @@ def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, # long, set it here and not outside the loop. pending_results = [] loop_tstart = time.time() + + # Register relay fingerprints to the heartbeat module + hbeat.register_consensus_fprs(relay_list.relays_fingerprints) + for target in relay_prioritizer.best_priority(): # Don't start measuring a relay if sbws is stopping. if settings.end_event.is_set(): @@ -511,7 +510,10 @@ def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, [args, conf, destinations, circuit_builder, relay_list, target], {}, callback, callback_err) pending_results.append(async_result) - measured_fp_set.add(async_result) + + # Register this measurement to the heartbeat module + hbeat.register_measured_fpr(target.fingerprint) + # After the for has finished, the pool has queued all the relays # and pending_results has the list of all the AsyncResults. # It could also be obtained with pool._cache, which contains @@ -519,10 +521,8 @@ def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, num_relays_to_measure = len(pending_results) wait_for_results(num_relays_to_measure, pending_results) - measured_percent = heartbeat.total_measured_percent( - measured_percent, relay_list.relays_fingerprints, measured_fp_set, - main_loop_tstart, conf.getpath('paths', 'state_fname') - ) + # Print the heartbeat message + hbeat.print_heartbeat_message() loop_tstop = time.time() loop_tdelta = (loop_tstop - loop_tstart) / 60 diff --git a/sbws/lib/heartbeat.py b/sbws/lib/heartbeat.py index 7dfa716..ad7fd88 100644 --- a/sbws/lib/heartbeat.py +++ b/sbws/lib/heartbeat.py @@ -9,38 +9,61 @@ from ..util.state import State log = logging.getLogger(__name__) -# NOTE tech-debt: this could go be tracked globally as a singleton -consensus_fp_set = set() +class Heartbeat(object): + """ + Tracks current status of sbws and is capable of printing periodic + information about the current state + """ -def total_measured_percent(measured_percent, relays_fingerprints, - measured_fp_set, main_loop_tstart, state_path): - """Returns the new percentage of the different relays that were measured. + def __init__(self, state_path): + # Variable to count total progress in the last days: + # In case it is needed to see which relays are not being measured, + # store their fingerprint, not only their number. + self.measured_fp_set = set() + self.consensus_fp_set = set() + self.measured_percent = 0 + self.main_loop_tstart = time.monotonic() - This way it can be known whether the scanner is making progress measuring - all the Network. + self.state_dict = State(state_path) - Log the percentage, the number of relays measured and not measured, - the number of loops and the time elapsed since it started measuring. - """ - global consensus_fp_set - # NOTE: in a future refactor make State a singleton in __init__.py - state_dict = State(state_path) - loops_count = state_dict.get('recent_priority_list_count', 0) - - # Store all the relays seen in all the consensuses. - [consensus_fp_set.add(r) for r in relays_fingerprints] - - not_measured_fp_set = consensus_fp_set.difference(measured_fp_set) - main_loop_tdelta = (time.monotonic() - main_loop_tstart) / 60 - new_measured_percent = round( - len(measured_fp_set) / len(consensus_fp_set) * 100) - log.info("Run %s main loops.", loops_count) - log.info("Measured in total %s (%s%%) unique relays in %s minutes", - len(measured_fp_set), new_measured_percent, main_loop_tdelta) - log.info("%s relays still not measured.", len(not_measured_fp_set)) - # The case when it is equal will only happen when all the relays have been - # measured. - if (new_measured_percent <= measured_percent): - log.warning("There is no progress measuring relays!.") - return new_measured_percent + self.previous_measurement_percent = 0 + + def register_measured_fpr(self, async_result): + self.measured_fp_set.add(async_result) + + def register_consensus_fprs(self, relay_fprs): + for r in relay_fprs: + self.consensus_fp_set.add(r) + + def print_heartbeat_message(self): + """Print the new percentage of the different relays that were measured. + + This way it can be known whether the scanner is making progress + measuring all the Network. + + Log the percentage, the number of relays measured and not measured, + the number of loops and the time elapsed since it started measuring. + """ + loops_count = self.state_dict.get('recent_priority_list_count', 0) + + not_measured_fp_set = self.consensus_fp_set.difference( + self.measured_fp_set + ) + main_loop_tdelta = (time.monotonic() - self.main_loop_tstart) / 60 + new_measured_percent = round( + len(self.measured_fp_set) / len(self.consensus_fp_set) * 100 + ) + + log.info("Run %s main loops.", loops_count) + log.info("Measured in total %s (%s%%) unique relays in %s minutes", + len(self.measured_fp_set), new_measured_percent, + main_loop_tdelta) + log.info("%s relays still not measured.", len(not_measured_fp_set)) + + # The case when it is equal will only happen when all the relays + # have been measured. + if (new_measured_percent <= self.previous_measurement_percent): + log.warning("There is no progress measuring relays!.") + + self.previous_measurement_percent = new_measured_percent diff --git a/tests/unit/lib/test_heartbeat.py b/tests/unit/lib/test_heartbeat.py index 55573a8..5c82a4b 100644 --- a/tests/unit/lib/test_heartbeat.py +++ b/tests/unit/lib/test_heartbeat.py @@ -1,21 +1,23 @@ """Unit tests for heartbeat""" import logging -import time from sbws.lib import heartbeat def test_total_measured_percent(conf, caplog): - measured_percent = 0 - measured_fp_set = set(['A', 'B']) - main_loop_tstart = time.monotonic() - relays_fingerprints = set(['A', 'B', 'C']) + hbeat = heartbeat.Heartbeat(conf.getpath('paths', 'state_fname')) + + hbeat.register_consensus_fprs(['A', 'B', 'C']) + + hbeat.register_measured_fpr('A') + hbeat.register_measured_fpr('B') caplog.set_level(logging.INFO) - new_measured_percent = heartbeat.total_measured_percent( - measured_percent, relays_fingerprints, measured_fp_set, - main_loop_tstart, conf.getpath('paths', 'state_fname') - ) - assert new_measured_percent == 67 + + assert hbeat.previous_measurement_percent == 0 + + hbeat.print_heartbeat_message() + + assert hbeat.previous_measurement_percent == 67 caplog.records[1].getMessage().find("Measured in total 2 (67%)") caplog.records[2].getMessage().find("1 relays still not measured")

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 21 Mar '19

21 Mar '19

commit 5eb36c8c437b658ef0d453532e459c655ea601cf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 21:50:47 2019 +0000 Update translations for support-portal --- contents+pt-BR.po | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ab3358fd4..0777d5751 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -9,6 +9,7 @@ # Giovana Morais <giovana.vmorais(a)gmail.com>, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # dark crystal <darc.krystal(a)insicuri.net>, 2019 +# Hildeberto Abreu Magalhães <hildeberto(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-19 08:55+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: dark crystal <darc.krystal(a)insicuri.net>, 2019\n" +"Last-Translator: Hildeberto Abreu Magalhães <hildeberto(a)gmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1917,8 +1918,8 @@ msgid "" "Can I still use another browser, like Chrome or Firefox, when I am using Tor" " Browser?" msgstr "" -"Eu posso ainda usar outro navegador, como Chrome ou Firefox, quando estou " -"usando Navegador Tor?" +"Eu posso continuar a usar outro navegador, como Chrome ou Firefox, ao usar o" +" Navegador Tor?" #: https//support.torproject.org/tbb/use-another-browser-chrome-firefox/ #: (content/tbb/tbb-5/contents+en.lrquestion.description) @@ -2187,7 +2188,7 @@ msgstr "" #: https//support.torproject.org/tormobile/run-tor-on-ios/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.title) msgid "Can I run Tor on an iOS device?" -msgstr "Posso utilizar o Tor em um dispositivo iOS?" +msgstr "Posso utilizar o Tor em um aparelho iOS?" #: https//support.torproject.org/tormobile/run-tor-on-ios/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -5002,6 +5003,11 @@ msgid "" "for command-line usage. This is a tool for monitoring the core Tor process " "on a system, often useful for relay operators." msgstr "" +"O monitor de [retransmissão](#relay) anonimizado (formalmente arm, agora " +"nyx) é um terminal para monitorar o status do [Tor](#tor-/-tor-network" +"/-core-tor), utilizado para uso pela linha de comando. É uma ferramenta para" +" monitoração do processo principal do Tor no sistema, muitas vezes utilizado" +" por operadores de retransmissão" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5021,6 +5027,10 @@ msgid "" " it does not look like Tor or any other protocol. Obfs3 bridges will work in" " most places." msgstr "" +"Obfs3 é um [transporte plugável](#pluggable-transports) que faz o " +"[tráfego](#traffic) do [Tor](#tor-/-tor-network/-core-tor) parecer " +"aleatório, para que não pareça com o Tor ou qualquer outro protocolo. Pontes" +" Obfs3 funcionarão em muitos lugares." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5035,6 +5045,11 @@ msgid "" "obfs3, and also prevents censors from finding bridges by Internet scanning. " "Obfs4 bridges are less likely to be blocked than obfs3 [bridges](#bridge)." msgstr "" +"Obfs4 é um [transporte plugável](#pluggable-transports) que faz o " +"[tráfego](#traffic) do [Tor](#tor-/-tor-network/-core-tor) parecer aleatório" +" como o obfs3, e também previne a censura dos escaneadores da Internet de " +"encontrar as pontes. Pontes Obfs4 são menos passíveis de serem bloqueados do" +" que [pontes](#bridge) obfs3 ." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5062,6 +5077,9 @@ msgid "" " observation network for detecting [censorship](#network-censorship), " "surveillance and [traffic](#traffic) manipulation on the internet." msgstr "" +"OONI significa \"Observatório Aberto de Interferência de Rede\", e é uma " +"rede de observação global para detectar [censura](#network-censorship), " +"vigilância e manipulação de [tráfego] (#traffic) na internet." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5075,6 +5093,9 @@ msgid "" " services (like websites) that are only accessible through the [Tor " "network](#tor-/-tor-network/-core-tor)." msgstr "" +"Serviços Onion (formalmente conhecidos como “[serviços ocultos](#hidden-" +"services)”) são serviços (como websites) que são acessíveis somente através " +"da [rede Tor](#tor-/-tor-network/-core-tor)." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5088,7 +5109,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "* hidden location and [IP address](#ip-address)" -msgstr "" +msgstr "* localização e [endereço IP](#ip-address) ocultos" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5102,7 +5123,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Onionoo" -msgstr "" +msgstr "### Onionoo" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 21 Mar '19

21 Mar '19

commit 5d55f6ad3c134bea14d35c828ebe0f4f97be0864 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 21:20:42 2019 +0000 Update translations for support-portal --- contents+pt-BR.po | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 536a56580..ab3358fd4 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -4,10 +4,10 @@ # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Emma Peel, 2019 # Danton Medrado, 2019 -# Communia <ameaneantie(a)riseup.net>, 2019 # Chacal Exodius, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Giovana Morais <giovana.vmorais(a)gmail.com>, 2019 +# Communia <ameaneantie(a)riseup.net>, 2019 # dark crystal <darc.krystal(a)insicuri.net>, 2019 # msgid "" @@ -5198,7 +5198,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## P" -msgstr "" +msgstr "## P" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5319,7 +5319,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "This signature can be verified by the public key." -msgstr "" +msgstr "Essa assinatura pode ser verificada pela chave pública." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5573,7 +5573,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor / Tor network/ Core Tor" -msgstr "" +msgstr "### Tor / rede Tor / Core Tor" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5599,6 +5599,9 @@ msgid "" "software associated with this network is called Core Tor, and sometimes " "[\"little-t tor\"](#little-t-tor)." msgstr "" +"Esse grupo de relays voluntários é chamado de rede Tor. As vezes o software " +"associado a esse rede é chamado de Core Tor, e outras vezes [\"tor de " +"t-minúsculo\"](#little-t-tor)." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5686,6 +5689,8 @@ msgid "" "It offers you the option to connect directly to the [Tor network](#tor" "-/-tor-network/-core-tor), or to configure Tor Browser for your connection." msgstr "" +"Lhe oferece a opção de se conectar diretamente a [rede Tor](#tor-/-tor-" +"network/-core-tor), ou configurar o Navegador Tor para sua conexão. " #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5720,14 +5725,15 @@ msgid "" "you can navigate to the [Tor button](#torbutton) (on the top left of the " "browser immediately to the left of the URL bar)." msgstr "" -"Se você não vê essa opção e você está com o [Navegador Tor](#tor-browser) " -"aberto, você pode navegar até o [botão Tor](#torbutton) (no canto superior " -"esquerdo do navegador imediatamente à esquerda da barra de URL). " +"Se você não estiver vendo essa opção e você estiver com o [Navegador Tor" +"](#tor-browser) aberto, você pode navegar até o [botão Tor](#torbutton) (no " +"canto superior esquerdo do navegador imediatamente à esquerda da barra de " +"URL). " #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "Click the Tor button, then open Tor Network Settings." -msgstr "" +msgstr "Clique no botão Tor e então abra as Configurações da rede Tor." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5852,11 +5858,15 @@ msgid "" "services) via Tor Browser, and will remove all [Tor](#tor-/-tor-network" "/-core-tor)-related protections the [client](#client) would otherwise have." msgstr "" +"NOTA: Isso não é tão seguro quanto conectar aos [serviços onion](#onion-" +"services) através do Navegador Tor e vai remover todas as proteções " +"relativas ao [Tor](#tor-/-tor-network/-core-tor) que o [cliente](#client) " +"teria. " #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TPI" -msgstr "" +msgstr "### TPI" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5906,7 +5916,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## W" -msgstr "" +msgstr "## W" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 21 Mar '19

21 Mar '19

commit 6022beb905492cd1fde83abb450aa4de6e75680d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 21:17:52 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+ru.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index db66495a5..d09a58b2b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1437,14 +1437,14 @@ msgstr "</dl>" #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.title) msgid "Security Slider" -msgstr "Переключатель безопасности" +msgstr "Уровень безопасности" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.description) #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.description) msgid "Configuring Tor Browser for security and usability" -msgstr "Настройка Tor Browser для безопасности и удобства использования" +msgstr "Настраиваем Tor Browser для безопасности и удобства использования" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1457,19 +1457,19 @@ msgid "" "some web pages from functioning properly, so you should weigh your security " "needs against the degree of usability you require." msgstr "" -"У Tor Browser есть \"Переключатель безопасности\", который позволяет вам " -"усилить безопасность, отключая определенные возможность веб-сайтов, которые " -"могут использоваться для атак в отношении вашей безопасности и анонимности. " -"Увеличение уровня безопасности в Tor Browser может помешать некоторым веб-" -"страницам работать правильно, так что вы должны взвесить ваши потребности в " -"безопасности по сравнению с удобством использования, которое вам требуется." +"У Tor Browser есть \"уровень безопасности\"; он позволяет повысить " +"безопасность, отключая определенные функции сайтов, которые могут быть " +"использованы злоумышленниками. Повышение уровня безопасности в Tor Browser " +"может привести к тому, что некоторые веб-страницы будут отображаться " +"неправильно. Пользователю лучше сравнить свои потребности в безопасности и " +"ожидаемое удобство использования." #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Slider" -msgstr "##### Доступ к Slider безопасности" +msgstr "##### Где находится уровень безопасности" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 21 Mar '19

21 Mar '19

commit 4db80c49a9d45b987060611f2dc62951c8b44935 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 21:17:45 2019 +0000 Update translations for tbmanual-contentspot --- contents+ru.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index db66495a5..d09a58b2b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1437,14 +1437,14 @@ msgstr "</dl>" #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.title) msgid "Security Slider" -msgstr "Переключатель безопасности" +msgstr "Уровень безопасности" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.description) #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.description) msgid "Configuring Tor Browser for security and usability" -msgstr "Настройка Tor Browser для безопасности и удобства использования" +msgstr "Настраиваем Tor Browser для безопасности и удобства использования" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1457,19 +1457,19 @@ msgid "" "some web pages from functioning properly, so you should weigh your security " "needs against the degree of usability you require." msgstr "" -"У Tor Browser есть \"Переключатель безопасности\", который позволяет вам " -"усилить безопасность, отключая определенные возможность веб-сайтов, которые " -"могут использоваться для атак в отношении вашей безопасности и анонимности. " -"Увеличение уровня безопасности в Tor Browser может помешать некоторым веб-" -"страницам работать правильно, так что вы должны взвесить ваши потребности в " -"безопасности по сравнению с удобством использования, которое вам требуется." +"У Tor Browser есть \"уровень безопасности\"; он позволяет повысить " +"безопасность, отключая определенные функции сайтов, которые могут быть " +"использованы злоумышленниками. Повышение уровня безопасности в Tor Browser " +"может привести к тому, что некоторые веб-страницы будут отображаться " +"неправильно. Пользователю лучше сравнить свои потребности в безопасности и " +"ожидаемое удобство использования." #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) #: https//tb-manual.torproject.org/en-US/security-slider.html #: (content/security-slider.html/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Slider" -msgstr "##### Доступ к Slider безопасности" +msgstr "##### Где находится уровень безопасности" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body)

1 0

[webwml/master] Update Erin's description
by atagar＠torproject.org 21 Mar '19

21 Mar '19

commit ed825d8802e13f0b421f9b416f77cbbf4dd97b9a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 21 14:06:41 2019 -0700 Update Erin's description Changing per Erin's request. --- about/en/corepeople.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index c1e5d0b1..7629b2ec 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -263,7 +263,8 @@ <div class="icon"><a href="../keys/ewyatt.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#ewyatt">Erin Wyatt</a></div> <div class="field"><b>IRC:</b> ewyatt</div> - <div class="description">Non-technical switchboard for people-related things: recruiting, onboarding, benefits, contracts, TPI policy questions, and baked goods.</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> + <div class="description">Director of People & Office Operations and a devoted dog mom.</div> </td> </tr>

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 21 Mar '19

21 Mar '19

commit d6abb42f1363f7df3bc467a60e7a243eb1a187e8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 21 20:51:12 2019 +0000 Update translations for support-portal --- contents+pt-BR.po | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index b4fb8dede..536a56580 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -5260,6 +5260,10 @@ msgid "" "the response back to the client. The service only communicates with and sees" " the proxy." msgstr "" +"Ao invés de se comunicar diretamente com o serviço, o cliente envia a " +"mensagem para o proxy. O proxy faz a requisição em nome do cliente e passa a" +" resposta de volta ao cliente. O serviço apenas vê e se comunica com o " +"proxy. " #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5339,6 +5343,9 @@ msgid "" "that forwards [traffic](#traffic) on behalf of [clients](#client), and that " "registers itself with the [directory authorities](#directory-authority)." msgstr "" +"Um nó listado publicamente na [rede Tor](#tor-/-tor-network/-core-tor) que " +"encaminha [tráfego](#traffic) em nome dos [clientes](#client), e que se " +"registra com as [autoridades de diretório](#directory-authority)." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5486,6 +5493,9 @@ msgid "" "[Tor](#tor-/-tor-network/-core-tor). Ifyou want to control core Tor with " "python, this is for you." msgstr "" +"Stem é uma biblioteca controladora de Python(linguagem de programação) para " +"o core do [Tor](#tor-/-tor-network/-core-tor). Se você quer controlar o core" +" do Tor com python, essa ferramenta é para você." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5516,6 +5526,9 @@ msgid "" "Tails is a \"live\" [operating system](#operating-system-os), that you can " "start on almost any computer from a DVD, USB stick, or SD card." msgstr "" +"Tails é um [sistema operacional](#operating-system-os) \"live\", que você " +"pode inicializar em quase qualquer computador a partir de um DVD, pendrive " +"ou cartão SD." #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5593,6 +5606,9 @@ msgid "" "The way most people use Tor is with [Tor Browser](#tor-browser) which is a " "version of [Firefox](#firefox) that fixes many privacy issues." msgstr "" +"A forma como a maioria das pessoas utilizam o Tor é com o [Navegador Tor" +"](#tor-browser) que é uma versão do [Firefox](#firefox) que corrige muitas " +"questões de privacidade. " #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5768,7 +5784,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Torbutton" -msgstr "" +msgstr "### Torbutton" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5797,7 +5813,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Torsocks" -msgstr "" +msgstr "### Torsocks" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[tpo/staging] fix #29608
by emmapeel＠torproject.org 21 Mar '19

21 Mar '19

commit ce387424121660199b911c5a3e25c588c563af08 Author: Antonela <hola(a)antonela.me> Date: Thu Mar 21 16:25:07 2019 -0300 fix #29608 https://trac.torproject.org/projects/tor/ticket/29608 --- content/about/sponsors/{anonymous-ngo => Internews}/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/anonymous-ngo/contents.lr b/content/about/sponsors/Internews/contents.lr similarity index 64% rename from content/about/sponsors/anonymous-ngo/contents.lr rename to content/about/sponsors/Internews/contents.lr index b6fc471..3f34388 100644 --- a/content/about/sponsors/anonymous-ngo/contents.lr +++ b/content/about/sponsors/Internews/contents.lr @@ -4,6 +4,6 @@ active: False --- time: 2008-2013 --- -name: An anonymous North American NGO +name: Internews --- link:

1 0

[tpo/staging] Fix #29512
by emmapeel＠torproject.org 21 Mar '19

21 Mar '19

commit 770149a50f33eeaf44603c11b610c94622a8c83a Author: Antonela <hola(a)antonela.me> Date: Thu Mar 21 16:50:30 2019 -0300 Fix #29512 https://trac.torproject.org/projects/tor/ticket/29512 --- .../about/jobs/backend-engineer-ooni/contents.lr | 27 +++++----- content/about/jobs/browser-developer/contents.lr | 58 +++++++++++----------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index f7181ed..cf78f24 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -18,9 +18,8 @@ You will be working to improve OONI’s data processing pipeline and other backe --- description: -Backend Engineer for OONI - -January 31, 2018 +## Backend Engineer for OONI +*January 31, 2018* The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. @@ -38,16 +37,16 @@ Here are some of our code repositories: https://github.com/ooni/collector https://github.com/ooni/sysadmin -Required skills and qualifications: +**Required skills and qualifications:** - Extensive experience in python or golang. - Comfortable working remotely. - Self-directed, self-disciplined, but good at working and communicating with a team. - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others’ code. - Experience documenting and designing protocols. - Be comfortable with transparency! + - Extensive experience in python or golang. + - Comfortable working remotely. + - Self-directed, self-disciplined, but good at working and communicating with a team. + - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others’ code. + - Experience documenting and designing protocols. + - Be comfortable with transparency! -Preferred qualifications: +**Preferred qualifications:** Experience designing, implementing, and maintaining scalable complex network applications. Working experience with data processing pipelines. @@ -59,7 +58,7 @@ Preferred qualifications: Contributed significant chunks of code to multiple open-source projects in the past. Be passionate about internet freedom and interested in contributing to it in a concrete way! -Other notes: +**Other notes:** Academic degrees are great but not required if you have the right experience. @@ -67,13 +66,13 @@ You should be very good at working remotely at communicating with the team on a Salary negotiable. -How to apply: +**How to apply:** Please email a *PDF* of your resume/CV, and a cover letter explaining how your qualifications and experience meet the requirements of this job description. Please include the reasons why you want to work on OONI. Please also include link to one or several code samples (of which you are authorized to share), and also your GitHub or GitLab profile, and three professional references. Email should be sent to jobs at openobservatory dot org with "OONI Backend Engineer" in the subject line. -About the project: +**About the project:** The Open Observatory of Network Interference (OONI) is a free software project under the Tor Project. OONI collects and processes network measurements with the aim of detecting network interferences, such as censorship, surveillance, and traffic manipulation. Since late 2012, OONI has collected millions of measurements across more than 90 countries around the world. diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index cf19093..6961dd6 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -19,41 +19,41 @@ As a browser developer, your job would be to work closely with other members of --- description: -The Tor Project is looking for a Browser Developer - -January 25, 2018 +##The Tor Project is looking for a Browser Developer +*January 25, 2018* The Tor Project is looking for a Browser Developer (C++ and Javascript)! As a browser developer, your job would be to work closely with other members of the Tor Browser development team on C++ patches to our Firefox-based browser, writing new APIs, altering functionality for privacy and security, and making improvements to our collection of Firefox add-ons (JavaScript code). Being a Tor Browser developer includes triaging, diagnosing, and fixing bugs; looking for and resolving web privacy issues; responding on short notice to urgent security issues; and working collaboratively with coworkers and volunteers to implement new features and web behavior changes. We also need help making our code more maintainable, testable, and mergeable by upstream. The person in this position will also review other people's code, designs, and academic research papers to make suggestions for improvement. This is a full-time position. -Required Qualifications: - - Experience in C++ (and ideally, JavaScript). Five years of C++ experience is probably necessary for the level of expertise we want, though some of these years can be replaced with other Object Oriented Programming and/or C experience. If you meet this level of experience with C++/OOP, JavaScript can be learned on the job. - Possess a solid understanding of issues surrounding secure C++ programming and reference counted memory (at least to the level of avoiding issues). - Be comfortable diving into new, unfamiliar codebases, looking for ways to alter and augment their functionality in specific, goal-oriented ways. - Be familiar with web technologies and how the web works, especially the same-origin model and web tracking. - Willingness and ability to justify and document technical decisions for a public, world-wide technical audience. - Be comfortable working remotely with a geographically distributed team. - Experience interacting with users and other developers online, including experience being confronted with differing ideas and opinions (not always in a nice manner), while maintaining a high level of professionalism. - Comfort with transparency: as a non-profit organization who develops open source software, almost everything we do is public, including your name (or at least your business name) and possibly salary information. - -Preferred qualifications: - - Familiarity and/or experience with writing add-ons and/or patches for Mozilla Firefox or other web browsers. - Familiarity with compiling software for the Android platform. - Familiarity with browser fingerprinting defenses - Familiarity with Firefox's internal architecture, including its use of multiple processes and sandboxing. - Be intensely creative yet also ruthlessly pragmatic in your thinking. - Possess knowledge/familiarity of probability, statistics, and information theory. - Know enough about networking to be able to visualize what HTTP 1.1 looks like on the wire while encapsulated within Tor's network protocol. - Experience working with distributed (remote) teams across different time-zones with people of differing skill levels over multiple mediums, including email, instant messaging, and IRC. - Open-source experience: contributed significant chunks of code to multiple open-source projects in the past. - Familiarity with distributed version control systems, including Git. - Familiarity with rust - Genuinely be excited about Tor and its values! - Willingness and ability to travel internationally to twice-yearly team meetings (strongly preferred). + +**Required Qualifications:** + +- Experience in C++ (and ideally, JavaScript). Five years of C++ experience is probably necessary for the level of expertise we want, though some of these years can be replaced with other Object Oriented Programming and/or C experience. If you meet this level of experience with C++/OOP, JavaScript can be learned on the job. +- Possess a solid understanding of issues surrounding secure C++ programming and reference counted memory (at least to the level of avoiding issues). +- Be comfortable diving into new, unfamiliar codebases, looking for ways to alter and augment their functionality in specific, goal-oriented ways. +- Be familiar with web technologies and how the web works, especially the same-origin model and web tracking. +- Willingness and ability to justify and document technical decisions for a public, world-wide technical audience. +- Be comfortable working remotely with a geographically distributed team. +- Experience interacting with users and other developers online, including experience being confronted with differing ideas and opinions (not always in a nice manner), while maintaining a high level of professionalism. +- Comfort with transparency: as a non-profit organization who develops open source software, almost everything we do is public, including your name (or at least your business name) and possibly salary information. + +**Preferred qualifications:** + +- Familiarity and/or experience with writing add-ons and/or patches for Mozilla Firefox or other web browsers. +- Familiarity with compiling software for the Android platform. +- Familiarity with browser fingerprinting defenses +- Familiarity with Firefox's internal architecture, including its use of multiple processes and sandboxing. +- Be intensely creative yet also ruthlessly pragmatic in your thinking. +- Possess knowledge/familiarity of probability, statistics, and information theory. +- Know enough about networking to be able to visualize what HTTP 1.1 looks like on the wire while encapsulated within Tor's network protocol. +- Experience working with distributed (remote) teams across different time-zones with people of differing skill levels over multiple mediums, including email, instant messaging, and IRC. +- Open-source experience: contributed significant chunks of code to multiple open-source projects in the past. +- Familiarity with distributed version control systems, including Git. +- Familiarity with rust +- Genuinely be excited about Tor and its values! +- Willingness and ability to travel internationally to twice-yearly team meetings (strongly preferred). For a more detailed understanding of the full breadth and depth of the work you'd be doing, have a look at The Design and Implementation of the Tor Browser, especially The Design Requirements section at https://www.torproject.org/projects/torbrowser/design/#DesignRequirements.

1 0