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

[tor/master] Merge branch '40068_maybe'
by nickm＠torproject.org 24 Jul '20

24 Jul '20

commit 010387e4bda401821ce05a67c6f1db60200275e7 Merge: ad9806b539 2299b31f40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 24 15:15:46 2020 -0400 Merge branch '40068_maybe' src/core/or/circuituse.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] Don't let a bad IPv6 orport stop our IPv4 bandwidth test.
by nickm＠torproject.org 24 Jul '20

24 Jul '20

commit 2299b31f405e01abefa28924d86634b386949377 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 24 14:50:42 2020 -0400 Don't let a bad IPv6 orport stop our IPv4 bandwidth test. Specifically: do not close IPv4 bandwidth-testing circuits just because our IPv6 orport is unreachable. Attempted fix for #40068. --- src/core/or/circuituse.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 3c8a7c4a89..df23c63cff 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1651,11 +1651,12 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !router_all_orports_seem_reachable(get_options())) { + !router_orport_seems_reachable(get_options(), AF_INET)) { /* either we've already done everything we want with testing circuits, - * or this testing circuit became open due to a fluke, e.g. we picked - * a last hop where we already had the connection open due to an - * outgoing local circuit. */ + * OR this IPv4 testing circuit became open due to a fluke, e.g. we picked + * a last hop where we already had the connection open due to a + * outgoing local circuit, OR this is an IPv6 self-test circuit, not + * a bandwidth test circuit. */ circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_AT_ORIGIN); } else if (circuit_enough_testing_circs()) { router_perform_bandwidth_test(NUM_PARALLEL_TESTING_CIRCS, time(NULL));

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 0160290cd07d90bce5b5a32630e6138fe3242af1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 19:15:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index a71f119030..3813c46440 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4024,6 +4024,9 @@ msgid "" "Hub](https://www.localizationlab.org/) on Transifex, a third-party " "translation platform." msgstr "" +"Nuestros esfuerzos localizar están alojados en el [Localization Lab " +"Hub](https://www.localizationlab.org/) en Transifex, una plataforma de " +"traducción tercerizada." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -4033,11 +4036,15 @@ msgid "" " page includes guidelines, resources, and priorities that will help you make" " the most out of your contribution." msgstr "" +"Antes de traducir, por favor lea la pagina de Tor Project en [Localization " +"Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). Esta pagina " +"incluye guías, recursos, y prioridades que te ayudaran a contribuir de la " +"mejor manera." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "### Localization mailing list" -msgstr "" +msgstr "### Lista de correos para localización" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -4047,6 +4054,10 @@ msgid "" "organize translations, participate in our decisions, report errors in source" " strings, etc." msgstr "" +"Esta cordialmente invitado a unirse a la [La lista de correos para " +"localización](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"l10n), para organizar traducciones, participar en nuestras decisiones, " +"reportar errores en la cadena de caracteres, etc." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)

1 0

[fallback-scripts/master] Relays shutting down in September
by dgoulet＠torproject.org 24 Jul '20

24 Jul '20

commit 61c5592c717b6d4dd97994f56416c0f568ee3502 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Jul 24 14:58:41 2020 -0400 Relays shutting down in September Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- fallback_offer_list | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fallback_offer_list b/fallback_offer_list index 0fa71ca..5258bd5 100644 --- a/fallback_offer_list +++ b/fallback_offer_list @@ -715,10 +715,6 @@ 178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB ipv6=[2001:41d0:2:a683::251]:443 # Email sent directly to teor, verified using relay contact info -31.185.104.19:80 orport=443 id=9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D -# same machine as 9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D -31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D -31.185.104.21:80 orport=443 id=C2AAB088555850FC434E68943F551072042B85F1 31.185.104.22:80 orport=443 id=5BA3A52760A0EABF7E7C3ED3048A77328FF0F148 # Email sent directly to teor, verified using relay contact info

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 8a9c8280299c42ad0c7d14a4be819b8474fe287b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 18:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 1106517195..a71f119030 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3956,6 +3956,10 @@ msgid "" "by fewer people around the world, but it is still critical that we improve " "access to Tor for people who do not speak English." msgstr "" +"Nuestras traducciones están incompletas para una gran cantidad de lenguajes." +" Capaz estos lenguajes estén hablados por unos pocos alrededor del mundo, " +"pero de igual manera es critico mejorar el acceso a Tor para aquellas " +"personas que no hablan Inglés." #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body) @@ -3963,6 +3967,8 @@ msgid "" "Please consider [helping with translations](/localization/becoming-tor-" "translator/) in your native language." msgstr "" +"Por favor considera [ayudar con la traducción](/localization/becoming-tor-" +"translator/) en tu lenguaje nativo." #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body) @@ -3970,13 +3976,15 @@ msgid "" "Right now, we need the most help with Farsi (Persian), Arabic, and Korean. " "But many other languages are being translated, as you can see here:" msgstr "" +"Ahora mismo, necesitamos mas ayuda con Farsi (Persa), Árabe, y Coreano. Pero" +" a muchos otros lenguajes están siendo traducidos, como puedes ver:" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body) #: https//community.torproject.org/localization/pick-a-project/ #: (content/localization/pick-a-project/contents+en.lrpage.body) msgid "<img class=\"col-lg-6\" src=\"../../static/images/localization/stats.png\">" -msgstr "" +msgstr "<img class=\"col-lg-6\" src=\"../../static/images/localization/stats.png\">" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body) @@ -3984,6 +3992,9 @@ msgid "" "You can see the open tickets about translation problems on our " "[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&c…." msgstr "" +"Tu puedes ver los boletos abiertos sobre los problemas en nuestras " +"traducciones en el " +"[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&c…." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.title) @@ -3997,11 +4008,14 @@ msgid "" "third-party translation platform. Learn how to sign up and begin " "contributing." msgstr "" +"Nuestros esfuerzos por localizar suceden en Localization Lab en Transifex, " +"una plataforma de traducción tercerizada. Aprenda mas como registrarse y " +"empezar contribuyendo." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "Thank you for your interest in helping us with translations." -msgstr "" +msgstr "Gracias por interesarte en ayudarnos con las traducciones." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)

1 0

[snowflake/master] Choose a random subset from given STUN servers
by cohosh＠torproject.org 24 Jul '20

24 Jul '20

commit 92520f681d77127fb7dd6e578080f1351ae885a8 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jul 23 09:28:21 2020 -0400 Choose a random subset from given STUN servers Only chooses a subset as long as we have over 2 STUN servers to choose from. --- client/client_test.go | 4 ++-- client/snowflake.go | 9 +++++++++ client/torrc | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index aeaf979..84e9cc1 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -49,8 +49,8 @@ func TestICEServerParser(t *testing.T) { So(len(servers), ShouldEqual, test.length) - for i, server := range servers { - So(server.URLs, ShouldResemble, test.urls[i]) + for _, server := range servers { + So(test.urls, ShouldContain, server.URLs) } } diff --git a/client/snowflake.go b/client/snowflake.go index 02bbf1e..c05431b 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -6,6 +6,7 @@ import ( "io" "io/ioutil" "log" + "math/rand" "net" "os" "os/signal" @@ -77,6 +78,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { } // s is a comma-separated list of ICE server URLs. +// chooses a random subset of servers from inputs func parseIceServers(s string) []webrtc.ICEServer { var servers []webrtc.ICEServer s = strings.TrimSpace(s) @@ -90,6 +92,13 @@ func parseIceServers(s string) []webrtc.ICEServer { URLs: []string{url}, }) } + rand.Seed(time.Now().Unix()) + rand.Shuffle(len(servers), func(i, j int) { + servers[i], servers[j] = servers[j], servers[i] + }) + if len(servers) > 2 { + servers = servers[:len(servers)/2] + } return servers } diff --git a/client/torrc b/client/torrc index 9e3946e..813d22d 100644 --- a/client/torrc +++ b/client/torrc @@ -4,7 +4,7 @@ DataDirectory datadir ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-broker.azureedge.net/ \ -front ajax.aspnetcdn.com \ --ice stun:stun.l.google.com:19302 \ +-ice stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 \ -max 3 Bridge snowflake 192.0.2.3:1

1 0

[snowflake/master] Refactor subsetting of ice servers into main
by cohosh＠torproject.org 24 Jul '20

24 Jul '20

commit 82031289a3362ff3fa199628276d76e840491431 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jul 24 11:38:58 2020 -0400 Refactor subsetting of ice servers into main This moves the subsetting of ice servers out of the parseIceServers function and into main. --- client/snowflake.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index c05431b..55bc48e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -78,7 +78,6 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { } // s is a comma-separated list of ICE server URLs. -// chooses a random subset of servers from inputs func parseIceServers(s string) []webrtc.ICEServer { var servers []webrtc.ICEServer s = strings.TrimSpace(s) @@ -92,13 +91,6 @@ func parseIceServers(s string) []webrtc.ICEServer { URLs: []string{url}, }) } - rand.Seed(time.Now().Unix()) - rand.Shuffle(len(servers), func(i, j int) { - servers[i], servers[j] = servers[j], servers[i] - }) - if len(servers) > 2 { - servers = servers[:len(servers)/2] - } return servers } @@ -153,6 +145,14 @@ func main() { log.Println("\n\n\n --- Starting Snowflake Client ---") iceServers := parseIceServers(*iceServersCommas) + // chooses a random subset of servers from inputs + rand.Seed(time.Now().UnixNano()) + rand.Shuffle(len(iceServers), func(i, j int) { + iceServers[i], iceServers[j] = iceServers[j], iceServers[i] + }) + if len(iceServers) > 2 { + iceServers = iceServers[:(len(iceServers)+1)/2] + } log.Printf("Using ICE servers:") for _, server := range iceServers { log.Printf("url: %v", strings.Join(server.URLs, " "))

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 3ca2d01eb05c00d58b51850ed5d5159ea7720fe4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 18:15:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contents+es.po b/contents+es.po index 8182b16064..1106517195 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3944,6 +3944,10 @@ msgid "" "the translations are finished, you are still welcome to help us with these " "languages." msgstr "" +"Tenemos algunos lenguajes en muy buena forma, con un alto numero activos y " +"comprometidos contribuidores (como Francés, Español, Ruso, Portugués). " +"Incluso cuando nuestras traducciones estén completas, igualmente seras " +"bienvenido a ayudarnos con estos lenguajes." #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body)

1 0

[tpo/master] Fix a phrase in membership page
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit be12e1c974e3c7971ce720726a4622914308d0e0 Author: gus <gus(a)torproject.org> Date: Fri Jul 24 14:10:30 2020 -0400 Fix a phrase in membership page --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 51755a34..171b5285 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,7 +42,7 @@ <div class="container"> <div class="row p-5 my-5 border text-center"> <p> - Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. </p> </div> </div>

1 0

[tpo/master] Fix avast logo
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit dafbe7a290c9007ab1d641778ececc59a2231add Author: gus <gus(a)torproject.org> Date: Fri Jul 24 14:04:40 2020 -0400 Fix avast logo --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index d0058337..51755a34 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -81,7 +81,7 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0