September 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 3384638c6d7dfe18c64066bd9916d46166223478 Merge: c1e020636 2ddbaf9cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 08:31:14 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27206 | 4 +++ src/rust/protover/protoset.rs | 49 +++++++++++++++++++++++++++---------- src/rust/protover/protover.rs | 4 +-- src/rust/protover/tests/protover.rs | 8 +++--- 4 files changed, 45 insertions(+), 20 deletions(-)

1 0

[tor/master] In conditionvar_timeout test, wait for threads to timeout
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 7a0ff5beb21e6485bda44c0545036bb2883f643d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 20:47:41 2018 -0400 In conditionvar_timeout test, wait for threads to timeout Previously we just waited 200msec, which was not enough on slow/busy systems. Fixes bug 27073; bugfix on 0.2.6.3-alpha when the test was introduced. --- changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/changes/bug27073 b/changes/bug27073 new file mode 100644 index 000000000..851e7f0df --- /dev/null +++ b/changes/bug27073 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Revise the "conditionvar_timeout" test so that it succeeds even + on heavily loaded systems where the test threads are not scheduled + within 200 msec. Fixes bug 27073; bugfix on 0.2.6.3-alpha. diff --git a/src/test/test_threads.c b/src/test/test_threads.c index ebbc95c7c..448ab2034 100644 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@ -234,25 +234,33 @@ test_threads_conditionvar(void *arg) if (timeout) { ti->tv = &msec100; } + +#define SPIN_UNTIL(condition,sleep_msec) \ + while (1) { \ + tor_mutex_acquire(ti->mutex); \ + if (condition) { \ + break; \ + } \ + tor_mutex_release(ti->mutex); \ + tor_sleep_msec(sleep_msec); \ + } + spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); - tor_mutex_acquire(ti->mutex); + SPIN_UNTIL(ti->n_threads == 4, 10); + + time_t started_at = time(NULL); + ti->addend = 7; ti->shutdown = 1; tor_cond_signal_one(ti->cond); tor_mutex_release(ti->mutex); #define SPIN() \ - while (1) { \ - tor_mutex_acquire(ti->mutex); \ - if (ti->addend == 0) { \ - break; \ - } \ - tor_mutex_release(ti->mutex); \ - } + SPIN_UNTIL(ti->addend == 0, 0) SPIN(); @@ -279,8 +287,9 @@ test_threads_conditionvar(void *arg) if (!timeout) { tt_int_op(ti->n_shutdown, ==, 4); } else { - tor_sleep_msec(200); - tor_mutex_acquire(ti->mutex); + const int GIVE_UP_AFTER_SEC = 30; + SPIN_UNTIL((ti->n_timeouts == 2 || + time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10); tt_int_op(ti->n_shutdown, ==, 2); tt_int_op(ti->n_timeouts, ==, 2); tor_mutex_release(ti->mutex); @@ -301,4 +310,3 @@ struct testcase_t thread_tests[] = { &passthrough_setup, (void*)"tv" }, END_OF_TESTCASES }; -

1 0

[tor/master] Merge remote-tracking branch 'github/bug27073_029'
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 4199c8b2d0d53b7c906943e5f844aafa57b9047d Merge: 925281464 7a0ff5beb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 08:16:42 2018 -0400 Merge remote-tracking branch 'github/bug27073_029' changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --cc src/test/test_threads.c index f0a4dd205,448ab2034..2bf502606 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@@ -275,14 -283,15 +283,15 @@@ test_threads_conditionvar(void *arg SPIN(); tor_mutex_release(ti->mutex); - tt_int_op(ti->value, ==, 1337); + tt_int_op(ti->value, OP_EQ, 1337); if (!timeout) { - tt_int_op(ti->n_shutdown, ==, 4); + tt_int_op(ti->n_shutdown, OP_EQ, 4); } else { - tor_sleep_msec(200); - tor_mutex_acquire(ti->mutex); + const int GIVE_UP_AFTER_SEC = 30; + SPIN_UNTIL((ti->n_timeouts == 2 || + time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10); - tt_int_op(ti->n_shutdown, ==, 2); - tt_int_op(ti->n_timeouts, ==, 2); + tt_int_op(ti->n_shutdown, OP_EQ, 2); + tt_int_op(ti->n_timeouts, OP_EQ, 2); tor_mutex_release(ti->mutex); }

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 83dc53e22dcb698f3c3d758092521e84c39e8523 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 12:18:32 2018 +0000 Update translations for torbutton-browseronboardingproperties_completed --- da/browserOnboarding.properties | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/da/browserOnboarding.properties b/da/browserOnboarding.properties new file mode 100644 index 000000000..dd257df49 --- /dev/null +++ b/da/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=Velkommen +onboarding.tour-tor-welcome.title=Du er klar. +onboarding.tour-tor-welcome.description=Tor Browser tilbyder den højeste standard indenfor privatliv og sikkerhed på webbet. Du er nu beskyttet mod sporing, overvågning og censur. Denne hurtige introduktion viser dig hvordan. +onboarding.tour-tor-welcome.button=Start nu + +onboarding.tour-tor-privacy=Privatliv +onboarding.tour-tor-privacy.title=Sæt en stopper for trackere og snoopers. +onboarding.tour-tor-privacy.description=Tor Browser isolerer cookies og sletter din browserhistorik efter din session. Ændringerne sikre dit privatliv, og sikkerheden beskyttes i browseren. Klik på ‘Tor-netværk’ for at lære hvordan vi beskytter dig på netværksniveauet. +onboarding.tour-tor-privacy.button=Gå til Tor-netværk + +onboarding.tour-tor-network=Tor-netværk +onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. +onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. +onboarding.tour-tor-network.button=Gå til kredsløb-visning + +onboarding.tour-tor-circuit-display=Kredsløb-visning +onboarding.tour-tor-circuit-display.title=Se din sti. +onboarding.tour-tor-circuit-display.description=Hver gang du besøger et domæne, videresendes og krypteres din trafik i et kredsløb hen over tre Tor-relæ verden over. Webstederne kan ikke se hvor du opretter forbindelse fra. Du kan anmode om et nyt kredsløb ved at klikke på ‘Nyt kredsløb til dette sted’ på vores kredsløb-display. +onboarding.tour-tor-circuit-display.button=Se min sti + +onboarding.tour-tor-security=Sikkerhed +onboarding.tour-tor-security.title=Vælg din oplevelse. +onboarding.tour-tor-security.description=Vi giver dig også yderligere sikkerhedsindstillinger for at øge din browsersikkerhed. Vores sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan bruges til at angribe din computer. Klik nedenfor for at se hvad de forskellige valgmuligheder gør. +onboarding.tour-tor-security.button=Gennemgå indstillinger + +onboarding.tour-tor-expect-differences=Oplevelesestips +onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. +onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting man være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. +onboarding.tour-tor-expect-differences.button=Se FAQ'er + +onboarding.tour-tor-onion-services=Onion-tjenester +onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. +onboarding.tour-tor-onion-services.description=Onion-tjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Onion-tjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onion-sted. +onboarding.tour-tor-onion-services.button=Besøg et onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=Næste +onboarding.tor-circuit-display.done=Fuldført +onboarding.tor-circuit-display.one-of-three=1 af 3 +onboarding.tor-circuit-display.two-of-three=2 af 3 +onboarding.tor-circuit-display.three-of-three=3 af 3 + +onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. + +onboarding.tor-circuit-display.diagram.title=Kredsløb-visning +onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. + +onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? +onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb.

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit fdc91b288c8fd15ac0e87652ac7afc2451594452 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 12:18:27 2018 +0000 Update translations for torbutton-browseronboardingproperties --- da/browserOnboarding.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/browserOnboarding.properties b/da/browserOnboarding.properties index 5e2c22f55..dd257df49 100644 --- a/da/browserOnboarding.properties +++ b/da/browserOnboarding.properties @@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 af 3 onboarding.tor-circuit-display.three-of-three=3 af 3 onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? -onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giv dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. onboarding.tor-circuit-display.diagram.title=Kredsløb-visning -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 411d514dd71c9870c9dabe2f147b2cf6082cc956 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 12:15:36 2018 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index e9f90f019..6a18eaf3e 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -18,6 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Habilitar conjuntos de reglas de contenido mixto"> <!ENTITY https-everywhere.options.showDevtoolsTab "Mostrar pestaña Devtools"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Reglas actualizadas automáticamente"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sitios Desactivados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Cuidado: Agregar canales de actualización puede originar que los atacantes secuestren tu navegador. ¡Edita esta sección sólo si sabes lo que estás haciendo!"> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir Actualizar Canales"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduce el nombre del canal de actualización"> @@ -38,6 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones cifradas a estos sitios web:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pueden causar advertencias u obstaculizaciones. Deshabilitado por defecto."> +<!ENTITY https-everywhere.chrome.disable_on_this_site "HTTPS Everywhere Desactivado en este lugar"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "HTTPS Everywhere Activado en este lugar"> <!ENTITY https-everywhere.chrome.add_rule "Añadir una regla para este sitio"> <!ENTITY https-everywhere.chrome.add_new_rule "Añadir una nueva regla para este sitio"> <!ENTITY https-everywhere.chrome.always_https_for_host "Usar siempre https para este servidor">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 2c376bc33f6b93ccdb599c3cfd3387e8260ffa47 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 12:15:29 2018 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 5ab0edfc3..6a18eaf3e 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Habilitar conjuntos de reglas de contenido mixto"> <!ENTITY https-everywhere.options.showDevtoolsTab "Mostrar pestaña Devtools"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Reglas actualizadas automáticamente"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sitios Desactivados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Cuidado: Agregar canales de actualización puede originar que los atacantes secuestren tu navegador. ¡Edita esta sección sólo si sabes lo que estás haciendo!"> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir Actualizar Canales"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduce el nombre del canal de actualización"> @@ -39,8 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones cifradas a estos sitios web:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pueden causar advertencias u obstaculizaciones. Deshabilitado por defecto."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable HTTPS Everywhere on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "HTTPS Everywhere Desactivado en este lugar"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "HTTPS Everywhere Activado en este lugar"> <!ENTITY https-everywhere.chrome.add_rule "Añadir una regla para este sitio"> <!ENTITY https-everywhere.chrome.add_new_rule "Añadir una nueva regla para este sitio"> <!ENTITY https-everywhere.chrome.always_https_for_host "Usar siempre https para este servidor">

1 0

[tor/master] Update description of onion_extend_cpath() (#27333)
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 863e2fcb4877a2efc005465edf21e90a1b02d42f Author: traumschule <traumschuleriebau(a)riseup.net> Date: Sun Sep 16 04:01:17 2018 +0200 Update description of onion_extend_cpath() (#27333) --- src/core/or/circuitbuild.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index cf2af4b66..b1dcfb853 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -2650,8 +2650,8 @@ onion_next_hop_in_cpath(crypt_path_t *cpath) return NULL; } -/** Choose a suitable next hop in the cpath head_ptr, - * based on state. Append the hop info to head_ptr. +/** Choose a suitable next hop for the circuit circ. + * Append the hop info to circ->cpath. * * Return 1 if the path is complete, 0 if we successfully added a hop, * and -1 on error.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/344'
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 92528146463e6e5bfbc5821dfdded67e5ea27f45 Merge: 5ef998fbf 863e2fcb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 08:15:02 2018 -0400 Merge remote-tracking branch 'tor-github/pr/344' src/core/or/circuitbuild.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'asn-github/bug27764'
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 50001d1c5b74b40ee858781dbd35dd7d209dac5b Merge: 7ca0f66b8 43324b0e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 08:10:25 2018 -0400 Merge remote-tracking branch 'asn-github/bug27764' src/lib/crypt_ops/crypto_rsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0