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

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit 02e63106583679e8925b39bd349d86cd077559ee Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 18:47:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+he.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+he.po b/contents+he.po index 18ad276228..5bc050ce88 100644 --- a/contents+he.po +++ b/contents+he.po @@ -3,7 +3,7 @@ # zxcsd <jenisjpl(a)gmail.com>, 2019 # ereznet <support(a)ereznet.co.il>, 2019 # Emma Peel, 2019 -# ido vasserman <itaizand(a)gmail.com>, 2019 +# itaizand, 2019 # erinm, 2020 # ION, 2020 # Omer, 2020 @@ -981,7 +981,7 @@ msgstr "" #: templates/download-tor.html:46 msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" -msgstr "" +msgstr "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, וגם Windows 98SE" #: templates/download-tor.html:47 msgid "Contains just Tor and nothing else." @@ -1037,7 +1037,7 @@ msgstr "" msgid "" "We do not recommend installing additional add-ons or plugins into Tor " "Browser" -msgstr "" +msgstr "אנחנו לא ממליצים להתקין תוספות או תוספים נוספים בדפדפן Tor" #: templates/download.html:28 msgid "" @@ -1068,7 +1068,7 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "הגן/י על עצמך" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" @@ -1080,7 +1080,7 @@ msgstr "הגן על עצמך." #: templates/hero-download.html:32 msgid "Download for" -msgstr "" +msgstr "הורדה עבור" #: templates/hero-download.html:33 msgid "Signature" @@ -1088,7 +1088,7 @@ msgstr "" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "הורדה עבור Android" #: templates/hero-download.html:49 msgid "Download in another language or platform"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit 5e925bddf2b8460bd10dfec43655a9538753c08e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 17:18:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index e744659fe0..c18b9b353b 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1351,11 +1351,14 @@ msgid "" "([metrics.torproject.org](https://metrics.torproject.org/)) which in turn " "present Tor network status information to humans." msgstr "" +"يوفر Onion بيانات التطبيقات ومواقع الويب الأخرى ([metrics.torproject.org] " +"(https://metrics.torproject.org/)) التي تقدم بدورها معلومات عن حالة شبكة Tor" +" إلى البشر." #: https//support.torproject.org/glossary/onionspace/ #: (content/glossary/onionspace/contents+en.lrword.term) msgid "onionspace" -msgstr "" +msgstr "onionspace" #: https//support.torproject.org/glossary/onionspace/ #: (content/glossary/onionspace/contents+en.lrword.definition) @@ -1364,6 +1367,8 @@ msgid "" "can say \"my site is in onionspace\" instead of \"my site is in the Dark " "Web.\"" msgstr "" +"مجموعة خدمات onion المتاحة (.. / خدمات onion). على سبيل المثال ، يمكنك أن " +"تقول \"موقعي في onionspace\" بدلاً من \"موقعي في الويب المظلم\"." #: https//support.torproject.org/glossary/ooni/ #: (content/glossary/ooni/contents+en.lrword.term)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit 177444163a8003edc0caec8aca22ce06803e943a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 16:48:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index bc60e21d00..e744659fe0 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1326,7 +1326,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.definition) msgid "These websites use the .onion Top Level Domain (TLD)." -msgstr "" +msgstr "تستخدم هذه المواقع نطاق المستوى الأعلى .onion (TLD)." #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.term) @@ -1340,6 +1340,9 @@ msgid "" "protocol to learn about currently running [Tor relays](../relay) and " "[bridges](../bridge)." msgstr "" +"[Onionoo] (https://metrics.torproject.org/onionoo.html) هو بروتوكول قائم على" +" الويب للتعرف على تشغيل [relays Tor] حاليًا (../ relay) و [bridges] (../ " +"bridge)." #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.definition)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit 9f7efc9d1316466ca160e9641b346d73bac08a74 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 15:16:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 489b8135a0..3a41f7ff45 100644 --- a/contents+es.po +++ b/contents+es.po @@ -5,12 +5,12 @@ # strel, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 # erinm, 2020 -# Zuhualime Akoochimoya, 2020 # Emma Peel, 2020 # deimidis <guillermo.movia(a)gmail.com>, 2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # David Figuera <dfb(a)fastmail.com>, 2020 # Fred Shen <niclored(a)hotmail.com>, 2020 +# Zuhualime Akoochimoya, 2020 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Fred Shen <niclored(a)hotmail.com>, 2020\n" +"Last-Translator: Zuhualime Akoochimoya, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2965,6 +2965,8 @@ msgid "" "If you find Tor Browser on the list of apps which need updating, select it " "and click the \"Update\" button." msgstr "" +"Si encuentras al Navegador Tor en la lista de aplicaciones que necesitan ser" +" actualizadas, selecciónalo y haz clic en el botón \"Actualizar\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2978,11 +2980,16 @@ msgid "" "/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on " "F-droid\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on " +"F-droid\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Click on \"Settings\", then go to \"Manage installed apps\"." msgstr "" +"Haz clic en \"Ajustes\", luego vé hacia \"Gestionar aplicaciones " +"instaladas\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2990,6 +2997,8 @@ msgid "" "On the next screen, select Tor Browser and finally click on the \"Update\" " "button." msgstr "" +"En la siguiente pantalla, selecciona Navegador Tor y finalmente haz clic en " +"el botón \"Actualizar\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3004,6 +3013,10 @@ msgid "" "of the latest Tor Browser release, then [install](/mobile-tor/#downloading-" "and-installation) it as before." msgstr "" +"Visita el [sitio web del Tor " +"Project](https://www.torproject.org/download/#android) y descarga una copia " +"del lanzamiento más reciente del Navegador Tor, luego [instálalo](/mobile-" +"tor/#downloading-and-installation) como antes." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3011,6 +3024,9 @@ msgid "" "In most cases, this latest version of Tor Browser will install over the " "older version, thereby upgrading the browser." msgstr "" +"En la mayoría de los casos, esta versión más reciente del Navegador Tor se " +"instalará sobre la versión más vieja, y de ese modo actualizará al " +"navegador." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3053,6 +3069,9 @@ msgid "" "/android-uninstall-google-play.png\" alt=\"Uninstalling Tor Browser for " "Android on Google Play\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-uninstall-google-play.png\" alt=\"Uninstalling Tor Browser for " +"Android on Google Play\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3075,6 +3094,9 @@ msgid "" "/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android " "on F-droid\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android " +"on F-droid\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3095,6 +3117,9 @@ msgid "" "/android-uninstall-device-settings.png\" alt=\"Uninstalling Tor Browser for " "Android using device app settings\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-uninstall-device-settings.png\" alt=\"Uninstalling Tor Browser for " +"Android using device app settings\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit bdbcd80bba2efb8ffb5af438a2e05834fac96994 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 14:16:59 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+it.po b/contents+it.po index d2190d61c1..5e15430061 100644 --- a/contents+it.po +++ b/contents+it.po @@ -617,7 +617,7 @@ msgid "" "help solving the problem." msgstr "" "Se la tua connessione è relativamente veloce, ma questa barra sembra " -"bloccarsi ad un certo punto, visita la pagina [Troubleshooting " +"bloccarsi ad un certo punto, visita la pagina [Troubleshooting] " "(it/troubleshooting) per trovare l'aiuto necessario. " #: https//tb-manual.torproject.org/running-tor-browser/ @@ -688,8 +688,8 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport." msgstr "" -"Ti verrà mostrata la sezione [Circumvention](../circumvention), per " -"configurare un trasporto collegabile. " +"Ti verrà mostrata la sezione [Elusione](it/circumvention), per configurare " +"un trasporto collegabile. " #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -962,7 +962,7 @@ msgid "" "Read the [Bridges](../bridges/) section to learn what bridges are and how to" " obtain them." msgstr "" -"Leggi la sezione [Bridges](../bridges/) per capire cosa sono i bridge e come" +"Leggi la sezione [Bridges](it/bridges/) per capire cosa sono i bridge e come" " ottenerli." #: https//tb-manual.torproject.org/bridges/

1 0

[tor/master] Merge branch 'maint-0.4.4'
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit e069b0af4b5d5825a23f3bf6a601cc4738599be6 Merge: ce57404a42 18d2c7c5d7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 3 16:49:05 2020 +0300 Merge branch 'maint-0.4.4' changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --cc src/core/mainloop/connection.c index d5a46143e9,36adc43d1e..b89a4ae796 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@@ -566,11 -382,14 +566,15 @@@ or_connection_new(int type, int socket_ tor_assert(type == CONN_TYPE_OR || type == CONN_TYPE_EXT_OR); connection_init(now, TO_CONN(or_conn), type, socket_family); + tor_addr_make_unspec(&or_conn->canonical_orport.addr); connection_or_set_canonical(or_conn, 0); - if (type == CONN_TYPE_EXT_OR) + if (type == CONN_TYPE_EXT_OR) { + /* If we aren't told an address for this connection, we should + * presume it isn't local, and should be rate-limited. */ + TO_CONN(or_conn)->always_rate_limit_as_remote = 1; connection_or_set_ext_or_identifier(or_conn); + } return or_conn; }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 Merge: 4c22050de1 ceb6585a4b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 3 16:48:52 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4 changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 Merge: 4c22050de1 ceb6585a4b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 3 16:48:52 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4 changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.4] Treat all extorport connections with un-set addresses as remote
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit ceb6585a4bc2beadde2fb194395711e72ee8559d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 15:20:41 2020 -0400 Treat all extorport connections with un-set addresses as remote Without this fix, if an PT forgets to send a USERADDR command, that results in a connection getting treated as local for the purposes of rate-limiting. If the PT _does_ use USERADDR, we still believe it. Closes ticket 33747. --- changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 5 ++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/changes/ticket33747 b/changes/ticket33747 new file mode 100644 index 0000000000..57c72e9d0a --- /dev/null +++ b/changes/ticket33747 @@ -0,0 +1,7 @@ + o Minor bugfixes (rate limiting, bridges, pluggable transports): + - On a bridge, treat all connections from an ExtORPort as remote + by default for the purposes of rate-limiting. Previously, + bridges would treat the connection as local unless they explicitly + received a "USERADDR" command. ExtORPort connections still + count as local if there is a USERADDR command with an explicit local + address. Fixes bug 33747; bugfix on 0.2.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3595bba85c..e895f8a73d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -379,8 +379,12 @@ or_connection_new(int type, int socket_family) connection_or_set_canonical(or_conn, 0); - if (type == CONN_TYPE_EXT_OR) + if (type == CONN_TYPE_EXT_OR) { + /* If we aren't told an address for this connection, we should + * presume it isn't local, and should be rate-limited. */ + TO_CONN(or_conn)->always_rate_limit_as_remote = 1; connection_or_set_ext_or_identifier(or_conn); + } return or_conn; } @@ -3025,6 +3029,7 @@ connection_is_rate_limited(connection_t *conn) if (conn->linked) return 0; /* Internal connection */ else if (! options->CountPrivateBandwidth && + ! conn->always_rate_limit_as_remote && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_family(&conn->addr) == AF_UNIX || /* no address */ tor_addr_is_internal(&conn->addr, 0))) diff --git a/src/core/or/connection_st.h b/src/core/or/connection_st.h index d1430eda14..c197a81340 100644 --- a/src/core/or/connection_st.h +++ b/src/core/or/connection_st.h @@ -64,6 +64,9 @@ struct connection_t { /** True if connection_handle_write is currently running on this connection. */ unsigned int in_connection_handle_write:1; + /** If true, then we treat this connection as remote for the purpose of + * rate-limiting, no matter what its address is. */ + unsigned int always_rate_limit_as_remote:1; /* For linked connections: */ diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 56c5bb96f5..136aee3084 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -494,6 +494,10 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, } conn->address = tor_addr_to_str_dup(&addr); + /* Now that we know the address, we don't have to manually override rate + * limiting. */ + conn->always_rate_limit_as_remote = 0; + return 0; } @@ -659,4 +663,3 @@ ext_orport_free_all(void) if (ext_or_auth_cookie) /* Free the auth cookie */ tor_free(ext_or_auth_cookie); } -

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit e62e46d9302ed22d7500c84861c4070cabd67534 Merge: 0f5d594388 18d2c7c5d7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 3 16:49:04 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-)

1 0