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

[tor/master] Merge branch 'tor-github/pr/1886'
by dgoulet＠torproject.org 19 May '20

19 May '20

commit ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e Merge: ee0fb69fe cce16a939 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 19 15:18:17 2020 -0400 Merge branch 'tor-github/pr/1886' src/lib/encoding/confline.c | 5 ++--- src/lib/fs/conffile.c | 1 + src/test/conf_examples/empty_3/expected_log | 2 +- src/test/conf_examples/include_1/expected_log | 2 +- src/test/conf_examples/include_bug_31408/expected_log | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1894'
by dgoulet＠torproject.org 19 May '20

19 May '20

commit 5d99985e438e6f602731612248e8f58f66db7a49 Merge: 400bc46d8 2e0d0360c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 19 15:14:38 2020 -0400 Merge branch 'tor-github/pr/1894' src/app/config/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Fix spacing in if statement in port_parse_config()
by dgoulet＠torproject.org 19 May '20

19 May '20

commit 2e0d0360cd0f8c1724c846f627b2a9940b4acbfb Author: Neel Chauhan <neel(a)neelc.org> Date: Sat May 16 22:23:59 2020 -0700 Fix spacing in if statement in port_parse_config() --- src/app/config/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 7ed373c54..71f8c18ca 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6159,7 +6159,7 @@ port_parse_config(smartlist_t *out, portname); goto err; } - if ( has_used_unix_socket_only_option && ! unix_socket_path) { + if (has_used_unix_socket_only_option && !unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " "WorldWritable, or RelaxDirModeCheck, but it is not a " "unix socket.", portname);

1 0

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

19 May '20

commit 3d6ca4806bd1a22e32e5b00cb3d72a73dba0ae47 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 19:15:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/contents+de.po b/contents+de.po index 0ae4e0542b..0178628de0 100644 --- a/contents+de.po +++ b/contents+de.po @@ -9533,7 +9533,7 @@ msgstr "Wie man eine obfs4-Brücke unter NetBSD einrichtet." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "### 1. Setup `pkg_add`" -msgstr "" +msgstr "### 1. Einrichtung von `pkg_add`" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9549,17 +9549,19 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "2. Install `obfs4proxy` and `tor` NetBSD's package" -msgstr "" +msgstr "2. Installiere `obfs4proxy` und NetBSD's `tor`-Paket" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "pkg_add obfs4proxy tor" -msgstr "" +msgstr "pkg_add obfs4proxy tor" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "### 2. Configure `/usr/pkg/etc/tor/torrc` to run **Tor** as a Bridge" msgstr "" +"### 2. Konfiguriere `/usr/pkg/etc/tor/torrc`, um **Tor** als eine Brücke zu " +"betreiben" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9609,6 +9611,8 @@ msgid "" "# Replace \"TODO1\" with a Tor port of your choice. This port must be " "externally" msgstr "" +"# Ersetze \"TODO1\" durch einen Tor-Anschluss deiner Wahl. Dieser Anschluss " +"muss extern" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9625,6 +9629,8 @@ msgstr "" msgid "" "# reachable. Avoid port 9001 because it's commonly associated with Tor and" msgstr "" +"# erreichbar sein. Vermeide Anschluss 9001, weil er üblicherweise mit Tor in" +" Verbindung gebracht wird, und" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9640,6 +9646,7 @@ msgstr "" #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# censors may be scanning the Internet for this port." msgstr "" +"# Zensoren suchen möglicherweise das Internet nach diesem Anschluss ab." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9677,6 +9684,8 @@ msgstr "ServerTransportPlugin obfs4 exec /usr/pkg/bin/obfs4proxy" #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# Replace \"TODO2\" with an obfs4 port of your choice. This port must be" msgstr "" +"# Ersetze \"TODO2\" durch einen obfs4-Anschluss deiner Wahl. Dieser " +"Anschluss muss" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9694,6 +9703,8 @@ msgid "" "# externally reachable and must be different from the one specified for " "ORPort." msgstr "" +"# von außen erreichbar sein und muss sich von dem für ORPort angegebenen " +"unterscheiden." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9709,6 +9720,7 @@ msgstr "" #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# Avoid port 9001 because it's commonly associated with" msgstr "" +"# Vermeide Anschluss 9001, weil er häufig in Verbindung gebracht wird mit" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9724,6 +9736,8 @@ msgstr "" #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# Tor and censors may be scanning the Internet for this port." msgstr "" +"# Tor, und Zensoren suchen möglicherweise das Internet nach diesem Anschluss" +" ab." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9760,6 +9774,8 @@ msgid "" "# Local communication port between Tor and obfs4. Always set this to " "\"auto\"." msgstr "" +"# Lokaler Kommunikations-Anschluss zwischen Tor und obfs4. Stelle dies immer" +" auf \"auto\" ein." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9775,6 +9791,8 @@ msgstr "" #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# \"Ext\" means \"extended\", not \"external\". Don't try to set a specific port" msgstr "" +"# \"Ext\" bedeutet \"erweitert\", nicht \"extern\". Versuche weder eine " +"bestimmte Anschluss-Nummer" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9789,7 +9807,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "# number, nor listen on 0.0.0.0." -msgstr "" +msgstr "# einzustellen, noch auf 0.0.0.0 zu hören." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9824,6 +9842,8 @@ msgid "" "# Replace \"<address(a)email.com>\" with your email address so we can contact " "you if" msgstr "" +"# Ersetze \"<address(a)email.com>\" mit deiner E-Mail-Adresse, damit wir dich " +"kontaktieren können, wenn" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9840,6 +9860,8 @@ msgstr "" msgid "" "# there are problems with your bridge. This is optional but encouraged." msgstr "" +"# es Probleme mit deiner Brücke gibt Dies ist freiwillig, wird aber " +"empfohlen." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)

1 0

[tor-browser-build/master] Use the new rebased Firefox branch
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 56e47ec447286e7d104e72813f1f21970a4e4493 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 19:08:48 2020 +0000 Use the new rebased Firefox branch --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index d51181f..5618abb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1

1 0

[tor-browser-build/master] Release preparations for 9.5a13
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 47985cd6e593c633419313ecc0965901290a538e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 18:56:16 2020 +0000 Release preparations for 9.5a13 Versions bump and Changelog update. --- projects/go/config | 4 ++-- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/projects/go/config b/projects/go/config index 509c6da..c0e3ee5 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.13.10 +version: 1.13.11 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: eb9ccc8bf59ed068e7eff73e154e4f5ee7eec0a47a610fb864e3332a2fdc8b8c + sha256sum: 89ed1abce25ad003521c125d6583c93c1280de200ad221f961085200a6c00679 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 911d0ae..29388a4 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 40d0ed51f51c7e42b9753b22292f35be5c30163d +git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a4b0f8a..168a021 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,22 @@ +Tor Browser 9.5a13 -- May 20 2020 + * All Platforms + * Update Firefox to 68.8.1esr + * Bump NoScript to 11.0.26 + * Bump Tor to 0.4.3.5 + * Translations update + * Bug 34157: Backport fix for Mozilla Bug 1511941 + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.7 + * Translations update + * Bug 34196: Update site info URL with the onion name + * Bug 34043: Update snowflake to persist sessions across proxies + * Windows + * Bug 33113: Bump NSIS version to 3.05 + * Build System + * All Platforms + * Bump Go to 1.13.11 + * Bug 34242: Fix creation of Linux containers + Tor Browser 9.5a12 -- May 7 2020 * All Platforms * Update Firefox to 68.8.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 33f0cd9..3f41ed2 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 + sha256sum: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 2b28a77..eb4dc24 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.6 +version: 0.2.21.7 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 70395fa..912f839 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.4-rc +version: 0.4.3.5 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 8e46c7f..131845c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a12' - torbrowser_build: 'build3' + torbrowser_version: '9.5a13' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a11 + - 9.5a12 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 287da89a5296e94f6aaf873e55084c8f24395cea Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 17:50:25 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 96321fdd1715..83bc9c956c3b 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 96321fdd1715f52cab00f6654ebc8fb420a5489d +Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 19 May '20

19 May '20

commit 656067e3bf200d3de314b110b5caf8b5ebb33ac2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 18:15:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ar/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index c976cfd2fd..fdf027c9ef 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -50,8 +50,8 @@ <!ENTITY https-everywhere.cancel.http_once "افتح الصفحة غير الآمنة فقط في هذه الجلسة"> <!ENTITY https-everywhere.onboarding.intro "شفر شبكة الإنترنت! استخدم تلقائيا تقنية HTTPS للأمان مع الكثير من المواقع."> -<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere has been updated!"> -<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere is an EFF project"> +<!ENTITY https-everywhere.onboarding.header "تم تحديث "HTTPS Everywhere""> +<!ENTITY https-everywhere.onboarding.footer ""HTTPS Everywhere" هي مشروع من مشاريع EFF"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "إعدادات لهذا الموقع"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "تغيير تفضيلاتك للإتصالات المشفرة">

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 19 May '20

19 May '20

commit 11e2f0e10d3d17fe419deb879b252f9c7d420f85 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 18:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- ar/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index e45fe668d2..6f1b7463bb 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline ""> <!ENTITY aboutTor.newsletter.link_text ""> -<!ENTITY aboutTor.donationBanner.line2e ""> +<!ENTITY aboutTor.donationBanner.freeToUse ""> <!ENTITY aboutTor.donationBanner.buttonA "">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 19 May '20

19 May '20

commit 0764297b02434274f830a7bdd546b79fe06d01cd Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 18:15:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ar/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index f4b18c3a51..2ad7557846 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "تور متاح مجاناً بفضل التبرعات من الأشخاص مثلك"> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">

1 0