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

[community/master] Add es_AR locale
by gus＠torproject.org 17 Nov '20

17 Nov '20

commit b30739334769000121013c87069343e9f3b4d2c3 Author: gus <gus(a)torproject.org> Date: Tue Nov 17 15:02:11 2020 -0500 Add es_AR locale --- community.lektorproject | 6 ++++++ configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/community.lektorproject b/community.lektorproject index e75ff45..1725581 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -9,3 +9,9 @@ name = English (en) primary = yes url_prefix = / locale = en + +[alternatives.es-AR] +name = Español Arg (es-AR) +primary = yes +url_prefix = /es-AR/ +locale = es-AR diff --git a/configs/i18n.ini b/configs/i18n.ini index 4145dc0..38f6d4b 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,de,fr,it,pt-BR,ru +translations = es,es-AR,de,fr,it,pt-BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = https://community.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 5ac0263..1bd9fd2 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -3,3 +3,9 @@ direction = text-left order = order-last url = / language = English (en) + +[es-AR] +direction = text-left +order = order-last +url = /es-AR/ +language = Español Arg. (es-AR)

1 0

[lego/master] Fix donate localized links
by hiro＠torproject.org 17 Nov '20

17 Nov '20

1 0

[tpo/master] Update TBA screenshot
by gus＠torproject.org 17 Nov '20

17 Nov '20

commit b76020637c3bb19c58f960b923f4022377ca59ff Author: antonela <antonela(a)torproject.org> Date: Tue Nov 3 09:48:52 2020 -0300 Update TBA screenshot --- .../images/tor-browser-mobile-window/png/TBA10.0.png | Bin 0 -> 85818 bytes templates/download-android.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/static/images/tor-browser-mobile-window/png/TBA10.0.png b/assets/static/images/tor-browser-mobile-window/png/TBA10.0.png new file mode 100644 index 00000000..dd50be37 Binary files /dev/null and b/assets/static/images/tor-browser-mobile-window/png/TBA10.0.png differ diff --git a/templates/download-android.html b/templates/download-android.html index aaa9e03c..57feacf0 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -37,7 +37,7 @@ </div> </div> <div class="d-none d-lg-block col-lg-4 p-5"> - <img class="img-fluid" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}" style="box-shadow: 0px 30px 100px rgba(0,0,0,0.5);"> + <img class="img-fluid w-75" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBA10.0.png'|asseturl }}" style="box-shadow: 0px 30px 100px rgba(0,0,0,0.5);"> </div> <div class="row py-5 content-center col-12"> <a class="text-light mx-auto text-center nick" href="https://onionbrowser.com" target="_blank"><i class="text-light fab fa-apple-png mr-3" alt="apple" ></i>{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a>

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 17 Nov '20

17 Nov '20

commit 4ea40cfd473f3634fbfbb12f046700d2a22970ce Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 17 17:47:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+it.po | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/contents+it.po b/contents+it.po index 7700410f0d..c2c627a781 100644 --- a/contents+it.po +++ b/contents+it.po @@ -34,7 +34,7 @@ msgstr "" #: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title) msgid "Tor Browser User Manual" -msgstr "Manuale utente del browser Tor" +msgstr "Manuale utente del Browser Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -284,7 +284,7 @@ msgid "" "relay." msgstr "" "L'immagine qui sopra rappresenta un utente che visita diversi siti web " -"utilizzando Tor. I computer verdi nel mezzo rappresentano dei relay nel " +"utilizzando Tor. I computer verdi nel mezzo rappresentano dei relays nel " "network Tor, mentre le tre chiavi rappresentano i livelli di cifratura tra " "l'utente e ogni relay." @@ -979,7 +979,7 @@ msgid "" "relays." msgstr "" "La maggior parte dei Pluggable Transports, come obfs4, si basano sull'uso di" -" \"bridge\" relè (ponti). " +" \"bridge\" relays (ponti). " #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -988,7 +988,7 @@ msgid "" "of “bridge” relays." msgstr "" "La maggior parte dei [Pluggable Transports](/it/circumvention), come obfs4, " -"si basano sull'uso di \"bridge\" relè." +"si basano sull'uso di \"bridge\" relays." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -997,8 +997,8 @@ msgid "" "relays, however, they are not listed publicly, so an adversary cannot " "identify them easily." msgstr "" -"Come i normali Tor relè, i bridge sono gestiti da volontari; a differenza " -"dei normali relè, tuttavia, non sono elencati pubblicamente, quindi un " +"Come i normali Tor relays, i bridge sono gestiti da volontari; a differenza " +"dei normali relays, tuttavia, non sono elencati pubblicamente, quindi un " "avversario non può identificarli facilmente." #: https//tb-manual.torproject.org/bridges/ @@ -1010,7 +1010,7 @@ msgid "" msgstr "" "L'uso di bridge in combinazione con i pluggable transports aiuta a " "nascondere il fatto che stai utilizzando Tor, ma può rallentare la " -"connessione rispetto all'utilizzo dei normali Tor relè." +"connessione rispetto all'utilizzo dei normali Tor relays." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1433,7 +1433,7 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" -"Questa opzione è utile se il [relè di uscita](/it/about/#how-tor-works) in " +"Questa opzione è utile se il [relay di uscita](/it/about/#how-tor-works) in " "uso non è in grado di connettersi al sito Web richiesto o non lo sta " "caricando correttamente. Selezionandolo, la scheda o la finestra attualmente" " attiva verrà ricaricata su un nuovo circuito Tor. Anche le altre schede e " @@ -2424,7 +2424,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### DOWNLOADING AND INSTALLATION" -msgstr "" +msgstr "### DOWNLOAD ED INSTALLAZIONE" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2517,12 +2517,12 @@ msgstr "3. Vai alle impostazioni, nell'angolo a destra in basso. " #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "4. Under the \"My Apps\" section, open Repositories." -msgstr "" +msgstr "4. Sotto la sezione \"Mie App\" apri Repository." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "5. Toggle \"Guardian Project Official Releases\" as enabled." -msgstr "" +msgstr "5. Abilita \"Guardian Project Official Releases\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2677,6 +2677,8 @@ msgid "" "You will then be taken to the [Circumvention](/mobile-tor/#circumvention) " "screen to configure a pluggable transport." msgstr "" +"Verrà quindi visualizzata la schermata [Elusione](/mobile-tor/#elusione) per" +" configurare un pluggable transport." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2689,7 +2691,7 @@ msgid "" "Bridge relays are Tor relays that are not listed in the public Tor " "directory." msgstr "" -"I bridge (o \"ponti\") sono dei relay che non sono presenti nell'elenco " +"I bridge (o \"ponti\") sono dei relays che non sono presenti nell'elenco " "pubblico di Tor." #: https//tb-manual.torproject.org/mobile-tor/ @@ -2710,6 +2712,8 @@ msgid "" "To use a pluggable transport, click on the settings icon when starting Tor " "Browser for the first time." msgstr "" +"Per utilizzare un pluggable transport, fare clic sull'icona delle " +"impostazioni quando si avvia Tor Browser per la prima volta." #: 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 17 Nov '20

17 Nov '20

commit 5eb3228dd9e6cd61e4a68420d7b5e9e850fa028e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 17 17:47:44 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contents+it.po b/contents+it.po index 9a3b8da079..c2c627a781 100644 --- a/contents+it.po +++ b/contents+it.po @@ -34,7 +34,7 @@ msgstr "" #: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title) msgid "Tor Browser User Manual" -msgstr "Manuale utente del browser Tor" +msgstr "Manuale utente del Browser Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -284,7 +284,7 @@ msgid "" "relay." msgstr "" "L'immagine qui sopra rappresenta un utente che visita diversi siti web " -"utilizzando Tor. I computer verdi nel mezzo rappresentano dei relay nel " +"utilizzando Tor. I computer verdi nel mezzo rappresentano dei relays nel " "network Tor, mentre le tre chiavi rappresentano i livelli di cifratura tra " "l'utente e ogni relay." @@ -979,7 +979,7 @@ msgid "" "relays." msgstr "" "La maggior parte dei Pluggable Transports, come obfs4, si basano sull'uso di" -" \"bridge\" relè (ponti). " +" \"bridge\" relays (ponti). " #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -988,7 +988,7 @@ msgid "" "of “bridge” relays." msgstr "" "La maggior parte dei [Pluggable Transports](/it/circumvention), come obfs4, " -"si basano sull'uso di \"bridge\" relè." +"si basano sull'uso di \"bridge\" relays." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -997,8 +997,8 @@ msgid "" "relays, however, they are not listed publicly, so an adversary cannot " "identify them easily." msgstr "" -"Come i normali Tor relè, i bridge sono gestiti da volontari; a differenza " -"dei normali relè, tuttavia, non sono elencati pubblicamente, quindi un " +"Come i normali Tor relays, i bridge sono gestiti da volontari; a differenza " +"dei normali relays, tuttavia, non sono elencati pubblicamente, quindi un " "avversario non può identificarli facilmente." #: https//tb-manual.torproject.org/bridges/ @@ -1010,7 +1010,7 @@ msgid "" msgstr "" "L'uso di bridge in combinazione con i pluggable transports aiuta a " "nascondere il fatto che stai utilizzando Tor, ma può rallentare la " -"connessione rispetto all'utilizzo dei normali Tor relè." +"connessione rispetto all'utilizzo dei normali Tor relays." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1433,7 +1433,7 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" -"Questa opzione è utile se il [relè di uscita](/it/about/#how-tor-works) in " +"Questa opzione è utile se il [relay di uscita](/it/about/#how-tor-works) in " "uso non è in grado di connettersi al sito Web richiesto o non lo sta " "caricando correttamente. Selezionandolo, la scheda o la finestra attualmente" " attiva verrà ricaricata su un nuovo circuito Tor. Anche le altre schede e " @@ -2424,7 +2424,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### DOWNLOADING AND INSTALLATION" -msgstr "### SCARICAMENTO ED INSTALLAZIONE" +msgstr "### DOWNLOAD ED INSTALLAZIONE" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2517,12 +2517,12 @@ msgstr "3. Vai alle impostazioni, nell'angolo a destra in basso. " #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "4. Under the \"My Apps\" section, open Repositories." -msgstr "4. Sotto la sezione \"Mie App\" apri Repository" +msgstr "4. Sotto la sezione \"Mie App\" apri Repository." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "5. Toggle \"Guardian Project Official Releases\" as enabled." -msgstr "5. Abilita \"Guardian Project Official Releases\"" +msgstr "5. Abilita \"Guardian Project Official Releases\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2691,7 +2691,7 @@ msgid "" "Bridge relays are Tor relays that are not listed in the public Tor " "directory." msgstr "" -"I bridge (o \"ponti\") sono dei relay che non sono presenti nell'elenco " +"I bridge (o \"ponti\") sono dei relays che non sono presenti nell'elenco " "pubblico di Tor." #: https//tb-manual.torproject.org/mobile-tor/

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/203' into maint-0.4.5
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 07006785fd47e6ce3303659a03004e133d204cc2 Merge: d04a27bed2 ffa7b15950 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 17 12:25:48 2020 -0500 Merge branch 'tor-gitlab/mr/203' into maint-0.4.5 changes/bug40017 | 5 +++++ src/core/or/connection_or.c | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.4.5] Deliberately close OR connections if proxies leave extra data
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit ffa7b15950a3274a03b0957425bcaa9952213046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 11:07:33 2020 -0500 Deliberately close OR connections if proxies leave extra data We already did this, but we did it by accident, which is pretty risky: if we hadn't, then our code would have treated extra data in the inbuf as having been transmitted as TLS-authenticated data. Closes ticket 40017; Found by opara. --- changes/bug40017 | 5 +++++ src/core/or/connection_or.c | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/changes/bug40017 b/changes/bug40017 new file mode 100644 index 0000000000..3f5c2da968 --- /dev/null +++ b/changes/bug40017 @@ -0,0 +1,5 @@ + o Minor features (protocol, proxy support, defense in depth): + - Respond more deliberately to misbehaving proxies that leave leftover + data on their connections, so as to be even less likely as to allow + them to pass their data off as having come from a relay. + Closes ticket 40017. diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index bf29cd2c3a..3be0b65f47 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -566,11 +566,6 @@ connection_or_reached_eof(or_connection_t *conn) int connection_or_process_inbuf(or_connection_t *conn) { - /** Don't let the inbuf of a nonopen OR connection grow beyond this many - * bytes: it's either a broken client, a non-Tor client, or a DOS - * attempt. */ -#define MAX_OR_INBUF_WHEN_NONOPEN 0 - int ret = 0; tor_assert(conn); @@ -581,6 +576,15 @@ connection_or_process_inbuf(or_connection_t *conn) /* start TLS after handshake completion, or deal with error */ if (ret == 1) { tor_assert(TO_CONN(conn)->proxy_state == PROXY_CONNECTED); + if (buf_datalen(conn->base_.inbuf) != 0) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Found leftover (%d bytes) " + "when transitioning from PROXY_HANDSHAKING state on %s: " + "closing.", + (int)buf_datalen(conn->base_.inbuf), + connection_describe(TO_CONN(conn))); + connection_or_close_for_error(conn, 0); + return -1; + } if (connection_tls_start_handshake(conn, 0) < 0) ret = -1; /* Touch the channel's active timestamp if there is one */ @@ -601,14 +605,12 @@ connection_or_process_inbuf(or_connection_t *conn) break; /* don't do anything */ } - /* This check was necessary with 0.2.2, when the TLS_SERVER_RENEGOTIATING - * check would otherwise just let data accumulate. It serves no purpose - * in 0.2.3. - * - * XXXX Remove this check once we verify that the above paragraph is - * 100% true. */ - if (buf_datalen(conn->base_.inbuf) > MAX_OR_INBUF_WHEN_NONOPEN) { - log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated too much data (%d bytes) " + /* This check makes sure that we don't have any data on the inbuf if we're + * doing our TLS handshake: if we did, they were probably put there by a + * SOCKS proxy trying to trick us into accepting unauthenticated data. + */ + if (buf_datalen(conn->base_.inbuf) != 0) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated data (%d bytes) " "on non-open %s; closing.", (int)buf_datalen(conn->base_.inbuf), connection_describe(TO_CONN(conn)));

1 0

[tor/master] Merge branch 'tor-gitlab/mr/203' into maint-0.4.5
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 07006785fd47e6ce3303659a03004e133d204cc2 Merge: d04a27bed2 ffa7b15950 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 17 12:25:48 2020 -0500 Merge branch 'tor-gitlab/mr/203' into maint-0.4.5 changes/bug40017 | 5 +++++ src/core/or/connection_or.c | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-)

1 0

[tor/master] Deliberately close OR connections if proxies leave extra data
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit ffa7b15950a3274a03b0957425bcaa9952213046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 11:07:33 2020 -0500 Deliberately close OR connections if proxies leave extra data We already did this, but we did it by accident, which is pretty risky: if we hadn't, then our code would have treated extra data in the inbuf as having been transmitted as TLS-authenticated data. Closes ticket 40017; Found by opara. --- changes/bug40017 | 5 +++++ src/core/or/connection_or.c | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/changes/bug40017 b/changes/bug40017 new file mode 100644 index 0000000000..3f5c2da968 --- /dev/null +++ b/changes/bug40017 @@ -0,0 +1,5 @@ + o Minor features (protocol, proxy support, defense in depth): + - Respond more deliberately to misbehaving proxies that leave leftover + data on their connections, so as to be even less likely as to allow + them to pass their data off as having come from a relay. + Closes ticket 40017. diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index bf29cd2c3a..3be0b65f47 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -566,11 +566,6 @@ connection_or_reached_eof(or_connection_t *conn) int connection_or_process_inbuf(or_connection_t *conn) { - /** Don't let the inbuf of a nonopen OR connection grow beyond this many - * bytes: it's either a broken client, a non-Tor client, or a DOS - * attempt. */ -#define MAX_OR_INBUF_WHEN_NONOPEN 0 - int ret = 0; tor_assert(conn); @@ -581,6 +576,15 @@ connection_or_process_inbuf(or_connection_t *conn) /* start TLS after handshake completion, or deal with error */ if (ret == 1) { tor_assert(TO_CONN(conn)->proxy_state == PROXY_CONNECTED); + if (buf_datalen(conn->base_.inbuf) != 0) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Found leftover (%d bytes) " + "when transitioning from PROXY_HANDSHAKING state on %s: " + "closing.", + (int)buf_datalen(conn->base_.inbuf), + connection_describe(TO_CONN(conn))); + connection_or_close_for_error(conn, 0); + return -1; + } if (connection_tls_start_handshake(conn, 0) < 0) ret = -1; /* Touch the channel's active timestamp if there is one */ @@ -601,14 +605,12 @@ connection_or_process_inbuf(or_connection_t *conn) break; /* don't do anything */ } - /* This check was necessary with 0.2.2, when the TLS_SERVER_RENEGOTIATING - * check would otherwise just let data accumulate. It serves no purpose - * in 0.2.3. - * - * XXXX Remove this check once we verify that the above paragraph is - * 100% true. */ - if (buf_datalen(conn->base_.inbuf) > MAX_OR_INBUF_WHEN_NONOPEN) { - log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated too much data (%d bytes) " + /* This check makes sure that we don't have any data on the inbuf if we're + * doing our TLS handshake: if we did, they were probably put there by a + * SOCKS proxy trying to trick us into accepting unauthenticated data. + */ + if (buf_datalen(conn->base_.inbuf) != 0) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated data (%d bytes) " "on non-open %s; closing.", (int)buf_datalen(conn->base_.inbuf), connection_describe(TO_CONN(conn)));

1 0

[tor/master] Merge branch 'maint-0.4.5' into master
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 0921fdf633f99cda0df3dab17e996d41dd596c9b Merge: bc968097f2 07006785fd Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 17 12:25:56 2020 -0500 Merge branch 'maint-0.4.5' into master changes/bug40017 | 5 +++++ src/core/or/connection_or.c | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-)

1 0