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

[donate-static/master] Merge branch 'add-mask-asset'
by gus＠torproject.org 26 Oct '20

26 Oct '20

commit 08bf972e17e0b1d09eeda25e5f2ef23402581a12 Merge: c4124701 0a18ddd1 Author: gus <gus(a)torproject.org> Date: Mon Oct 26 15:47:24 2020 -0400 Merge branch 'add-mask-asset' assets/static/images/donate/mask-use-tor.png | Bin 0 -> 256882 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[donate-static/master] Update content/contents.lr
by gus＠torproject.org 26 Oct '20

26 Oct '20

commit cbcc03cd9681664981e91dc995c0aa457e6899f4 Author: Antonela <antonela(a)torproject.org> Date: Mon Oct 26 14:20:11 2020 +0000 Update content/contents.lr --- content/contents.lr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 502e7d70..db0dcde3 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -40,17 +40,17 @@ single_three: 12500 --- single_two: 7500 --- -sticker_perk_single_description: A collection of our favorite logo stickers for decorating your stuff and covering your cams. +sticker_perk_single_description: Get our limited edition Use Tor mask and fight the surveillance pandemic. --- -sticker_perk_single_image: /static/images/donate/stickerpack-1.png +sticker_perk_single_image: /static/images/donate/mask-use-tor.png --- -sticker_perk_single_label: Sticker Pack +sticker_perk_single_label: Mask --- -sticker_perk_monthly_description: A collection of our favorite logo stickers for decorating your stuff and covering your cams (Monthly). +sticker_perk_monthly_description: Get our limited edition Use Tor mask and fight the surveillance pandemic (Monthly). --- -sticker_perk_monthly_image: /static/images/donate/stickerpack-1.png +sticker_perk_monthly_image: /static/images/donate/mask-use-tor.png --- -sticker_perk_monthly_label: Sticker Pack +sticker_perk_monthly_label: Mask --- sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie. ---

1 0

[donate-static/master] Update contents.lr
by gus＠torproject.org 26 Oct '20

26 Oct '20

commit c41247016ba350d64026a79c495ffb50e3a26b97 Author: Antonela <antonela(a)torproject.org> Date: Mon Oct 26 18:59:45 2020 +0000 Update contents.lr --- content/contents.lr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index db0dcde3..733b4eae 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -40,13 +40,13 @@ single_three: 12500 --- single_two: 7500 --- -sticker_perk_single_description: Get our limited edition Use Tor mask and fight the surveillance pandemic. +sticker_perk_single_description: Get our limited-edition Use Tor mask and fight the surveillance pandemic. --- sticker_perk_single_image: /static/images/donate/mask-use-tor.png --- sticker_perk_single_label: Mask --- -sticker_perk_monthly_description: Get our limited edition Use Tor mask and fight the surveillance pandemic (Monthly). +sticker_perk_monthly_description: Get our limited-edition Use Tor mask and fight the surveillance pandemic (Monthly). --- sticker_perk_monthly_image: /static/images/donate/mask-use-tor.png --- @@ -68,13 +68,13 @@ tshirt_pack_perk_single_description: Get this year's Use Tor t-shirt and the Tak --- tshirt_pack_perk_single_label: T-Shirt Pack --- -tshirt_perk_single_description: Get our limited edition Use Tor shirt. +tshirt_perk_single_description: Get our limited-edition Use Tor shirt. --- tshirt_pack_perk_monthly_description: Get this year's Use Tor t-shirt and the Take Back the Internet With Tor t-shirt. --- tshirt_pack_perk_monthly_label: T-Shirt Pack --- -tshirt_perk_monthly_description: Get our limited edition Use Tor shirt. +tshirt_perk_monthly_description: Get our limited-edition Use Tor shirt. --- tshirt_perk_single_label: T-Shirt ---

1 0

[translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
by translation＠torproject.org 26 Oct '20

26 Oct '20

commit 9a76ade1ae429a68eb231eb79610b587ef7aa9ea Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 19:45:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- fr/torbrowser_strings.xml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/fr/torbrowser_strings.xml b/fr/torbrowser_strings.xml index f5ace8233e..f8c3f8ea7e 100644 --- a/fr/torbrowser_strings.xml +++ b/fr/torbrowser_strings.xml @@ -2,6 +2,9 @@ - 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/. --> <resources> +  + <string name="tor_about_content">%1$s est produit par le Projet Tor, un organisme étatsunien sans but lucratif 501(c)(3).</string> +  <string name="preferences_disable_normal_mode">N’autoriser que le mode de navigation privée</string>  @@ -20,12 +23,7 @@ <string name="tor_onboarding_security_level">Définir votre niveau de sécurité</string> <string name="tor_onboarding_security_level_description">Désactiver certaines fonctions Web qui peuvent être utilisées pour vous attaquer et nuire à votre sécurité, à votre anonymat et à la protection de vos données personnelles.</string> - <string name="tor_onboarding_security_level_standard_option">Normal</string> - <string name="tor_onboarding_security_level_standard_button_description">Toutes les fonctions du Navigateur Tor et des sites Web sont activées.</string> - <string name="tor_onboarding_security_level_safer_option">Plus sûr</string> - <string name="tor_onboarding_security_level_safer_button_description">Désactiver les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites.</string> - <string name="tor_onboarding_security_level_safest_option">Le plus sûr</string> - <string name="tor_onboarding_security_level_safest_button_description">Ne permettre que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les contenus multimédias et les scripts.</string> + <string name="tor_onboarding_chosen_security_level_label">Niveau de sécurité actuel :%s</string> <string name="tor_onboarding_security_settings_button">Ouvrir les paramètres de sécurité</string> <string name="tor_onboarding_donate_header">Faites un don et assurez la sécurité de Tor</string> <string name="tor_onboarding_donate_description">Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous.</string> @@ -59,4 +57,19 @@ <string name="preferences_tor_network_settings_connected">Connecté</string> <string name="preferences_tor_network_settings_restarting">Redémarrage</string> <string name="preferences_tor_network_settings_bridges_enabled">Les ponts sont activés : %s</string> + +  + <string name="preferences_tor_security_level_settings">Paramètres de sécurité</string> + <string name="preferences_tor_security_level_options">Niveau de sécurité</string> + +  + <string name="tor_security_level_standard_option">Normal</string> + <string name="tor_security_level_standard_description">Toutes les fonctions du Navigateur Tor et des sites Web sont activées.</string> + <string name="tor_security_level_safer_option">Plus sûr</string> + <string name="tor_security_level_safer_description">Désactiver les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites.</string> + <string name="tor_security_level_safest_option">Le plus sûr</string> + <string name="tor_security_level_safest_description">Ne permettre que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les contenus multimédias et les scripts.</string> + +  + <string name="tor_spoof_english">Pour une confidentialité accrue, demander la version anglaise des pages Web.</string> </resources>

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 26 Oct '20

26 Oct '20

commit 2d957e7b0d6021306c7d7f29dc4deb47eb9cb7e3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 19:45:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- fr/torbrowser_strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fr/torbrowser_strings.xml b/fr/torbrowser_strings.xml index 9d18570ad7..f8c3f8ea7e 100644 --- a/fr/torbrowser_strings.xml +++ b/fr/torbrowser_strings.xml @@ -2,6 +2,9 @@ - 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/. --> <resources> +  + <string name="tor_about_content">%1$s est produit par le Projet Tor, un organisme étatsunien sans but lucratif 501(c)(3).</string> +  <string name="preferences_disable_normal_mode">N’autoriser que le mode de navigation privée</string>  @@ -20,6 +23,7 @@ <string name="tor_onboarding_security_level">Définir votre niveau de sécurité</string> <string name="tor_onboarding_security_level_description">Désactiver certaines fonctions Web qui peuvent être utilisées pour vous attaquer et nuire à votre sécurité, à votre anonymat et à la protection de vos données personnelles.</string> + <string name="tor_onboarding_chosen_security_level_label">Niveau de sécurité actuel :%s</string> <string name="tor_onboarding_security_settings_button">Ouvrir les paramètres de sécurité</string> <string name="tor_onboarding_donate_header">Faites un don et assurez la sécurité de Tor</string> <string name="tor_onboarding_donate_description">Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous.</string> @@ -66,4 +70,6 @@ <string name="tor_security_level_safest_option">Le plus sûr</string> <string name="tor_security_level_safest_description">Ne permettre que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les contenus multimédias et les scripts.</string> - </resources> +  + <string name="tor_spoof_english">Pour une confidentialité accrue, demander la version anglaise des pages Web.</string> +</resources>

1 0

[tpo/master] Add new Tor Browser version 10.0a9 (Android-only)
by sysrqb＠torproject.org 26 Oct '20

26 Oct '20

commit ec0a6dcac386dd098cbd1928f870075f137559fd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 26 17:20:10 2020 +0000 Add new Tor Browser version 10.0a9 (Android-only) --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 9ccd6471..d8f8d115 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,7 +9,7 @@ version = 9.5.4 version = 10.5a2 [torbrowser-android-alpha] -version = 10.0a8 +version = 10.0a9 [tor-stable] version = 0.4.4.5

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/169' into master
by asn＠torproject.org 26 Oct '20

26 Oct '20

commit 07f2a06c6190696cf47b8e42476bb70b11083f15 Merge: f43fe890dd 05242f5555 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Oct 26 17:04:58 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/169' into master changes/bug33124 | 4 ++++ src/core/or/circuituse.c | 3 ++- src/core/or/connection_edge.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Pass the SOCKS request address in relay begin cells
by asn＠torproject.org 26 Oct '20

26 Oct '20

commit 05242f5555ceb276dd945f9d43a37dbe3d5d875b Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Oct 12 20:46:42 2020 -0700 Pass the SOCKS request address in relay begin cells --- changes/bug33124 | 4 ++++ src/core/or/circuituse.c | 3 ++- src/core/or/connection_edge.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug33124 b/changes/bug33124 new file mode 100644 index 0000000000..bc7003d9b5 --- /dev/null +++ b/changes/bug33124 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS, onion services): + - Make sure we send the SOCKS request address in relay begin cells when a + stream is attached with the purpose CIRCUIT_PURPOSE_CONTROLLER. Fixes bug + 33124; bugfix on 0.0.5. Patch by Neel Chauhan. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index df23c63cff..a0816fc73c 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2710,7 +2710,8 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, apconn->may_use_optimistic_data = 0; log_info(LD_APP, "Looks like completed circuit to %s %s allow " "optimistic data for connection to %s", - circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL ? + (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_CONTROLLER) ? /* node_describe() does the right thing if exitnode is NULL */ safe_str_client(node_describe(exitnode)) : "hidden service", diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 25337f0720..f22c49d036 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1205,6 +1205,7 @@ connection_ap_expire_beginning(void) } if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL && + circ->purpose != CIRCUIT_PURPOSE_CONTROLLER && circ->purpose != CIRCUIT_PURPOSE_C_HSDIR_GET && circ->purpose != CIRCUIT_PURPOSE_S_HSDIR_POST && circ->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT && @@ -3266,7 +3267,8 @@ connection_ap_handshake_send_begin,(entry_connection_t *ap_conn)) edge_conn->begincell_flags = connection_ap_get_begincell_flags(ap_conn); tor_snprintf(payload,RELAY_PAYLOAD_SIZE, "%s:%d", - (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL) ? + (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_CONTROLLER) ? ap_conn->socks_request->address : "", ap_conn->socks_request->port); payload_len = (int)strlen(payload)+1;

1 0

[tor-browser-build/maint-10.0a9] Add missing ChangeLog entry and tag build1
by sysrqb＠torproject.org 26 Oct '20

26 Oct '20

commit 638b865f9c42400f44112e8e34e7cb51190620c1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 26 13:40:04 2020 +0000 Add missing ChangeLog entry and tag build1 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e759802..5f9e6ef 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 10.0a9 -- October 26 2020 * Update NoScript to 11.1.3 * Update OpenSSL to 1.1.1h * Bug 30605: Honor privacy.spoof_english + * Bug 40003: Block starting Tor when setup is not complete [tor-android-service] * Bug 40004: "Tor Browser" string is used instead of "Alpha"/"Nightly" for non en-US locales [tor-android-service] * Bug 40016: Allow inheriting from AddonCollectionProvider [android-components] * Bug 40017: Rebase android-components patches to 60 [android-components]

1 0

[donate-static/master] Fix #6
by gus＠torproject.org 26 Oct '20

26 Oct '20

commit 848fe85379d55c4c1f70a29c94d82c1d6c708586 Author: gus <gus(a)torproject.org> Date: Mon Oct 26 08:46:28 2020 -0400 Fix #6 --- templates/cryptocurrency.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html index 99cb2d6f..e81202f6 100644 --- a/templates/cryptocurrency.html +++ b/templates/cryptocurrency.html @@ -1,7 +1,7 @@ {% block content %} <div class="cryptocurrency"> <div class="payment-other-div container"> - <a class="hyperlinks links" href="/donate">{{ _('Want to donate by credit card or PayPal?') }}</a> + <a class="hyperlinks links" href="https://donate.torproject.org/">{{ _('Want to donate by credit card or PayPal?') }}</a> </div> <div class="intro-text-section container"> {{ this.body }}

1 0