August 2014 - tor-commits - lists.torproject.org

[oonib/master] Bug in test_bouncer fixed
by art＠torproject.org 28 Aug '14

28 Aug '14

commit d25cc99abdd7ed667f436a9f82c9420dcedc5282 Author: kudrom <kudrom(a)riseup.net> Date: Thu Aug 28 22:10:26 2014 +0200 Bug in test_bouncer fixed --- oonib/test/handler_helpers.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/oonib/test/handler_helpers.py b/oonib/test/handler_helpers.py index e6dc0ba..4e9905d 100644 --- a/oonib/test/handler_helpers.py +++ b/oonib/test/handler_helpers.py @@ -45,12 +45,16 @@ class HandlerTestCase(unittest.TestCase): def make_dir(self, dir): if not os.path.exists(dir): - os.mkdir(dir) - self.directories.add(dir) + os.makedirs(dir) + try: + self.directories.add(dir) + except AttributeError: + self.directories = set([dir]) def setUp(self, *args, **kw): self.filenames = set() - self.directories = set() + if 'directories' not in dir(self): + self.directories = set() self.old_arguments = sys.argv if self.config_filename != '': sys.argv = ['test_oonib', '-c', self.config_filename]

1 0

[oonib/master] Fix compatibility with txtorcon >= 0.10.0
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 4c7ed13fffea854f2f62d0bba61c50fd833bde9b Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Aug 29 01:22:21 2014 +0200 Fix compatibility with txtorcon >= 0.10.0 --- oonib/runner.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/oonib/runner.py b/oonib/runner.py index aa5cd1a..84b1e88 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -63,8 +63,12 @@ else: endpointName = endpoint.settings['name'] def setup_complete(port): + if LooseVersion(txtorcon_version) >= LooseVersion('0.10.0'): + onion_uri = port.address.onion_uri + else: + onion_uri = port.onion_uri print("Exposed %s Tor hidden service " - "on httpo://%s" % (endpointName, port.onion_uri)) + "on httpo://%s" % (endpointName, onion_uri)) public_port = 80 data_dir = os.path.join(torconfig.DataDirectory, endpointName)

1 0

[oonib/master] Add coveralls descriptor to repo
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 6e8333d39a924e94f35487a888e52b5e55f03602 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 28 19:33:01 2014 +0200 Add coveralls descriptor to repo --- 0 files changed diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..e69de29

1 0

[oonib/master] Fix code coverage badge
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 93ced706b5641c0c7a2effd54bc563b90524ecfb Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Aug 28 19:39:10 2014 +0200 Fix code coverage badge --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 27df278..1d73234 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ oonibackend: backend infrastructure for ooniprobe .. image:: https://travis-ci.org/TheTorProject/ooni-backend.png?branch=master :target: https://travis-ci.org/TheTorProject/ooni-backend -.. image:: https://coveralls.io/repos/TheTorProject/ooni-backend/badge.png +.. image:: https://coveralls.io/repos/TheTorProject/ooni-backend/badge.png?branch=mast… :target: https://coveralls.io/r/TheTorProject/ooni-backend oonibackend is used by ooniprobe to discover the addresses of test helpers (via

1 0

[oonib/master] Tell coveralls of the coveragerc
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 73ca1687dae90253315405373e1b5f05fef64dc5 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Aug 29 01:11:19 2014 +0200 Tell coveralls of the coveragerc --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6617b3..0e20f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,4 @@ script: - echo "Build successful." - $(which coverage) run $(which trial) oonib after_success: - - coveralls + - coveralls --rcfile=".coveragerc"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 54c681c2ecbd231d0485c64eee98bd29ddd28900 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 23:15:39 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pl/network-settings.dtd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index ffca856..9d794b4 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nie"> <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> -<!ENTITY torSettings.configurePrompt1 "Połączenie tego komputera jest cenzurowane, filtrowane lub przekierowywane."> -<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować most, firewall lub ustawienia serwera proxy."> +<!ENTITY torSettings.configurePrompt1 "Połączenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować most lub ustawienia serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connectPrompt2 "Chcę połączyć się bezpośrednio z siecią Tor."> <!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Jeśli nie jesteś pewny odpowiedzi sprawdź ustawienia internetowe innej przeglądarki, czy jest skonfigurowana do użycia serwera proxy."> <!ENTITY torSettings.enterProxy "Wprowadź ustawienia serwera proxy"> -<!ENTITY torSettings.firewallQuestion "Czy połączenie internetowe Twojego komputera pozwala przejść przez zaporę sieciową w celu nawiązania połączenia z ustalonymi portami?"> -<!ENTITY torSettings.firewallHelp "Jeśli nie jesteś pewien jak odpowiedzieć na to pytanie, wybierz Nie. W przypadku wystąpienia problemów z połączeniem, zmień tą opcję."> -<!ENTITY torSettings.enterFirewall "Wprowadź listę portów dozwolonych przez zaporę (kolejne porty oddzielaj przecinkiem)."> <!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> <!ENTITY torSettings.bridgeHelp "Jeśli nie jesteś pewny odpowiedzi na to pytanie proszę wybrać odpowiedź Nie.  Jeśli wybierzesz Tak, to będziesz poproszony o skonfigurowanie mostków Tora, które nie są publicznie wymienione, dzięki czemu będzie trudniej zablokować połączenia do sieci Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit f31a679252c116372dc4db962cadd52f7ca7fc6d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 23:15:37 2014 +0000 Update translations for tor-launcher-network-settings --- pl/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index 13d716d..9d794b4 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nie"> <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Połączenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować most lub ustawienia serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connectPrompt2 "Chcę połączyć się bezpośrednio z siecią Tor."> <!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit d96178acc8038848246cac31adf33ab811dcdc1b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 23:15:31 2014 +0000 Update translations for tor-launcher-properties --- pl/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties index ca4a2d1..e7746bb 100644 --- a/pl/torlauncher.properties +++ b/pl/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Gotowe torlauncher.forAssistance=By uzyskać pomoc, skontaktuj się -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email. torlauncher.bootstrapStatus.conn_dir=Podłączanie do katalogu węzłów torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego połączenia z katalogiem

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Backport two integer overflow patches.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit b1f011d993b4a00db2cb50c49dea38ec5188fdb0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 16:04:57 2014 -0700 Backport two integer overflow patches. https://hg.mozilla.org/mozilla-central/rev/14ad832ecbcd https://hg.mozilla.org/mozilla-central/rev/c00387255d25 https://bugzilla.mozilla.org/show_bug.cgi?id=922603 https://bugzilla.mozilla.org/show_bug.cgi?id=811122 --- image/src/imgFrame.cpp | 10 +++------- js/src/vm/Interpreter-inl.h | 8 ++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index c1b4022..33d1b3a 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -19,6 +19,7 @@ static bool gDisableOptimize = false; #include "cairo.h" #include "GeckoProfiler.h" #include "mozilla/Likely.h" +#include "mozilla/CheckedInt.h" #if defined(XP_WIN) @@ -54,13 +55,8 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - int32_t tmp = aWidth * aHeight; - if (MOZ_UNLIKELY(tmp / aHeight != aWidth)) { - NS_WARNING("width or height too large"); - return false; - } - tmp = tmp * 4; - if (MOZ_UNLIKELY(tmp / 4 != aWidth * aHeight)) { + CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false; } diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h index b5818e4..0a665d1 100644 --- a/js/src/vm/Interpreter-inl.h +++ b/js/src/vm/Interpreter-inl.h @@ -368,13 +368,9 @@ AddOperation(JSContext *cx, HandleScript script, jsbytecode *pc, { if (lhs.isInt32() && rhs.isInt32()) { int32_t l = lhs.toInt32(), r = rhs.toInt32(); - int32_t sum = l + r; - if (JS_UNLIKELY(bool((l ^ sum) & (r ^ sum) & 0x80000000))) { - res->setDouble(double(l) + double(r)); + double d = double(l) + double(r); + if (!res->setNumber(d)) types::TypeScript::MonitorOverflow(cx, script, pc); - } else { - res->setInt32(sum); - } return true; }

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 73d7c72ed9c54e7d00ceec3d08e25fb5d88e5c9b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 22:15:41 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index d93bfe7..b78b35c 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar o bridge, firewall ou opções de proxy."> +<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> +<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Caso você não tenha certeza sobre como responder a essa questão, consulte as configurações de rede em um outro browser para saber se ele está configurado para usar um proxy."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> -<!ENTITY torSettings.firewallQuestion "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a certas portas?"> -<!ENTITY torSettings.firewallHelp "Se você não tiver certeza sobre como responder a esta questão, escolha Não. Em caso de dificuldades de conexão à rede Tor, modifique esta configuração."> -<!ENTITY torSettings.enterFirewall "Insira, separando-as por vírgulas, uma lista de portas habilitadas pelo firewall. "> <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> <!ENTITY torSettings.bridgeHelp "Se você não estiver seguro sobre como responder a essa questão, escolha Não . Se você escolher Sim, será preciso configurar pontes Tor, que são retransmissores não-listados que dificultam possíveis bloqueios à rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. "> @@ -59,6 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Envie um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'. . Contudo, para tornar mais difícil para um invasor descobrir uma grande quantidade de endereços de pontes, esse pedido deve ser enviado de uma conta gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'.  Contudo, para tornar mais difícil para um invasor descobrir uma grande quantidade de endereços, você deve enviar esse pedido a partir de um dos seguintes provedores de e-mail (listados em ordem de preferência)."> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pelo serviço de assistência"> <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org. . Note que uma pessoa terá que responder a cada solicitação">

1 0