June 2015 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 35ee6e5200856f0736bf8108f78ccb1b0f48fa72 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 15:15:43 2015 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 01f7253..a117fa0 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Configuración del proxy local"> <!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">  <!ENTITY torSettings.proxyHelp "Si no está seguro de cómo responder a esta pregunta, mire la configuración de Internet en otro navegador para ver si está configurado para utilizar un proxy (interpuesto) local."> <!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Configuración de puentes Tor"> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> <!ENTITY torSettings.bridgeHelp "Si no está seguro de como responder a esta pregunta, elija No.  Si usted elige Sí, se le pedirá configurar puentes Tor, los cuales son repetidores no listados que hacen más difícil el bloqueo de las conexiones hacia la red Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de repetidores puente (bridge) proporcionado, o puede obtener e introducir un juego de puentes personalizado.">

1 0

[stem/master] Fixed a spelling error
by atagar＠torproject.org 11 Jun '15

11 Jun '15

commit e3cd3fe43befecef409fb63e320ff64db50f4c19 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Thu Jun 11 19:02:33 2015 +0400 Fixed a spelling error --- stem/descriptor/microdescriptor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index ffbec43..1362147 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -19,7 +19,7 @@ corresponding router status entry. For added fun as of this writing the controller doesn't even surface those router status entries (:trac:`7953`). -For instance, here's an example that prints the nickname and fignerprints of +For instance, here's an example that prints the nickname and fingerprints of the exit relays. ::

1 0

[tor/master] Tweak clang sanitizer blacklist for out-of-tree builds, make, ccache
by nickm＠torproject.org 11 Jun '15

11 Jun '15

commit 3879c1016270ce319eb001732b72dc7d2144b74c Author: teor <teor2345(a)gmail.com> Date: Thu Jun 11 00:59:04 2015 +1000 Tweak clang sanitizer blacklist for out-of-tree builds, make, ccache Avoid using file names and file paths for compatibility with out-of-tree builds. Note make and ccache don't track blacklist dependencies, add workarounds. --- contrib/clang/sanitize_blacklist.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/contrib/clang/sanitize_blacklist.txt b/contrib/clang/sanitize_blacklist.txt index d4f6cf6..03d1e70 100644 --- a/contrib/clang/sanitize_blacklist.txt +++ b/contrib/clang/sanitize_blacklist.txt @@ -29,6 +29,9 @@ # It has not been tested with ThreadSanitizer or MemorySanitizer # Success report and patches for other sanitizers or OSs are welcome +# ccache and make don't account for the sanitizer blacklist as a dependency +# you might need to set CCACHE_DISABLE=1 and/or use make clean to workaround + # Configuration Flags: # -fno-sanitize-recover=all # causes clang to crash on undefined behavior, rather than printing @@ -67,23 +70,23 @@ # Blacklist Entries: +# test-memwipe.c checks if a freed buffer was properly wiped +fun:vmemeq +fun:check_a_buffer + # we need to allow the tor bt handler to catch SIGSEGV # otherwise address sanitizer munges the expected output and the test fails # we can do this by setting an environmental variable # See https://code.google.com/p/address-sanitizer/wiki/Flags # ASAN_OPTIONS=allow_user_segv_handler=1 -# test-memwipe.c checks if a freed buffer was properly wiped -fun:vmemeq -fun:check_a_buffer - # test_bt_cl.c stores to a NULL pointer to trigger a crash fun:crash # curve25519-donna.c left-shifts 1 bits into and past the sign bit of signed -# integers. Until #13538 is resolved, we can exempt the entire file from all -# analysis under clang's undefined behavior sanitizer. -# This may be overkill, but it works, and is easier than listing every -# function in the file. +# integers. Until #13538 is resolved, we exempt functions that do left shifts. # Note that x86_64 uses curve25519-donna-c64.c instead of curve25519-donna.c -src:src/ext/curve25519_donna/curve25519-donna.c +fun:freduce_coefficients +fun:freduce_degree +fun:s32_eq +fun:fcontract

1 0

[tor/master] Merge remote-tracking branch 'teor/feature15817-clang-sanitizers'
by nickm＠torproject.org 11 Jun '15

11 Jun '15

commit c3e3c6ca850d9c28091446eac009ae858bb0157f Merge: aab7d66 3879c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 11 10:24:28 2015 -0400 Merge remote-tracking branch 'teor/feature15817-clang-sanitizers' contrib/clang/sanitize_blacklist.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)

1 0

[tor/master] Add a log message to try to track down #16013
by nickm＠torproject.org 11 Jun '15

11 Jun '15

commit aab7d666cd51fdccdb735f7fa2c59f93d0c450e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 11 09:55:47 2015 -0400 Add a log message to try to track down #16013 --- src/or/circuituse.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index a429a7d..28c70ad 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1843,6 +1843,12 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, tor_assert(conn); tor_assert(circp); + if (ENTRY_TO_CONN(conn)->state != AP_CONN_STATE_CIRCUIT_WAIT) { + connection_t *c = ENTRY_TO_CONN(conn); + log_err(LD_BUG, "Connection state mismatch: wanted " + "AP_CONN_STATE_CIRCUIT_WAIT, but got %d (%s)", + c->state, conn_state_to_string(c->type, c->state)); + } tor_assert(ENTRY_TO_CONN(conn)->state == AP_CONN_STATE_CIRCUIT_WAIT); check_exit_policy = conn->socks_request->command == SOCKS_COMMAND_CONNECT &&

1 0

[chutney/master] Wait a second before checking if tor has launched
by nickm＠torproject.org 11 Jun '15

11 Jun '15

commit b2558a7b467edab332ef74eb3111735883eece2d Author: teor <teor2345(a)gmail.com> Date: Thu Jun 11 16:39:39 2015 +1000 Wait a second before checking if tor has launched Resolves bug 16310 - chutney thinks tor fails to launch under high load. --- tools/bootstrap-network.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 09f4611..a198d82 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -37,5 +37,6 @@ for file in net/nodes/*a/torrc; do done $CHUTNEY start networks/$flavour +sleep 1 $CHUTNEY status networks/$flavour #echo "tail -F net/nodes/*/notice.log"

1 0

[tor-messenger-build/master] Windows: don't include libgcrypt and libgpg-error in ctypes-otr
by boklm＠torproject.org 11 Jun '15

11 Jun '15

commit 008bc47300331ed67c81367b4e1c6eecd57b0c35 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 11 14:55:40 2015 +0200 Windows: don't include libgcrypt and libgpg-error in ctypes-otr They are now linked statically in libotr, so we don't need to include them. --- projects/ctypes-otr/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build index 8b0d232..e7e5238 100644 --- a/projects/ctypes-otr/build +++ b/projects/ctypes-otr/build @@ -6,11 +6,12 @@ mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/conten [% IF c('var/windows') -%] mv -f [% project %]-[% c('version') %]/chrome/content/libotr-*.dll \ [% project %]-[% c('version') %]/chrome/content/otr.dll -[% END -%] +[% ELSE -%] tar xf [% c('input_files_by_name/libgcrypt') %] mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ tar xf [% c('input_files_by_name/libgpg-error') %] mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ +[% END -%] [% SET src_dir=project _ '-' _ c('version'); c('tar', { tar_src => [src_dir],

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 28674fedd05b2e127bc300f5e6cf17d9a7a04d86 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 12:15:50 2015 +0000 Update translations for tor-launcher-network-settings_completed --- fr_CA/network-settings.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fr_CA/network-settings.dtd b/fr_CA/network-settings.dtd index 328088a..f7aa22d 100644 --- a/fr_CA/network-settings.dtd +++ b/fr_CA/network-settings.dtd @@ -15,10 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> +<!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet?">  <!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de connaître la réponse à cette question, vérifiez les paramètres Internet d'un autre navigateur pour voir s'il est configuré pour utiliser un mandataire local."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> +<!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> <!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment répondre à cette question, choisissez Non.  Si vous choisissez Oui, on vous demandera de configurer les ponts Tor qui sont des relais non listés rendant le bloquage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 1eaf017d7c2b9fd1a64b5e94d138081724d3b5c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 12:15:44 2015 +0000 Update translations for tor-launcher-network-settings --- fr_CA/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr_CA/network-settings.dtd b/fr_CA/network-settings.dtd index 03a7b2f..f7aa22d 100644 --- a/fr_CA/network-settings.dtd +++ b/fr_CA/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet?">  <!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de connaître la réponse à cette question, vérifiez les paramètres Internet d'un autre navigateur pour voir s'il est configuré pour utiliser un mandataire local."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> <!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment répondre à cette question, choisissez Non.  Si vous choisissez Oui, on vous demandera de configurer les ponts Tor qui sont des relais non listés rendant le bloquage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 11 Jun '15

11 Jun '15

commit 103f70c808a16e5b32d41f8684cab1f93019d259 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 11 10:46:10 2015 +0000 Update translations for torbutton-branddtd_completed --- it/brand.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/it/brand.dtd b/it/brand.dtd index 225f9b7..e2d7b24 100644 --- a/it/brand.dtd +++ b/it/brand.dtd @@ -2,6 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project">

1 0