June 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/maint-7.5] Revert "Bug 26428: add temporary fix to avoid https-e submodule error"
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 1c472c7aeff5f81b1d8e8357e37168520d14a36a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 00:14:35 2018 +0000 Revert "Bug 26428: add temporary fix to avoid https-e submodule error" This reverts commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0. First part of Bug 26451. --- projects/https-everywhere/config | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index c55933e..2385c5c 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,12 +1,10 @@ # vim: filetype=yaml sw=2 version: 2018.6.13 -git_url: https://github.com/boklm/https-everywhere -# Temporary fix for #26428 -git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87 +git_url: https://git.torproject.org/https-everywhere.git +git_hash: '[% c("version") %]' git_submodule: 1 gpg_keyring: https-everywhere.gpg -# Temporarily disable gpg check for #26428 -#tag_gpg_id: 1 +tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid

1 0

[tor-browser-build/maint-7.5] Bug 26451: Latest https-everywhere, fixes browser freeze
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 74af3e0e1432b956c11ee95d32eb68dc968fe209 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 00:16:58 2018 +0000 Bug 26451: Latest https-everywhere, fixes browser freeze --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2385c5c..739347b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.6.13 +version: 2018.6.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-build/maint-7.5] Picking up a new HTTPS Everywhere version
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 4377771ed4db4b90f7dddf8fc9a56626dfe491e6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 22 04:24:31 2018 +0000 Picking up a new HTTPS Everywhere version --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 84f2c76..6f9af8a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,8 +4,8 @@ Tor Browser 7.5.6 -- June 26 2018 * Update Tor to 0.3.3.7 * Update Tor Launcher to 0.2.14.5 * Bug 20890: Increase control port connection timeout - * Update HTTPS Everywhere to 2018.6.13 - * Bug 26428: Work around HTTPS Everywhere caused build bustage + * Update HTTPS Everywhere to 2018.6.21 + * Bug 26451: Prevent HTTPS Everywhere from freezing the browser * Update NoScript to 5.1.8.6 * Bug 21537: Mark .onion cookies as secure * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) diff --git a/rbm.conf b/rbm.conf index 31b9cc1..a741f7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[torbutton/master] Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 72aacbd7178d50abf2c95c43ce907e65b95ddb1c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 12:33:21 2018 +0000 Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu" This reverts commit d127873b498fb83e4f608b82a8d382df25183dd3. --- src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7f750bc..b56a628 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -175,9 +175,6 @@ var torbutton_unique_pref_observer = case "privacy.firstparty.isolate": torbutton_update_isolation_prefs(); break; - case "extensions.torbutton.hide_sync_ui": - torbutton_update_sync_ui(); - break; } } } @@ -404,7 +401,6 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - torbutton_update_sync_ui(); createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, m_tb_control_port, m_tb_control_pass, @@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } -// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so, -// hide the "Sign in to Sync" button on the hamburger menu. -function torbutton_update_sync_ui() -{ - try { - document.getElementById("PanelUI-footer-fxa").style.display = - getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : ""; - } catch (e) { - torbutton_log(5, 'Error updating the Sync UI: ' + e); - } -} - // Update the NoScript button to reflect any changes to noscript prefs function torbutton_update_noscript_button() { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..5cfb0eb 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.hide_sync_ui", true); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_26058'
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 824e6df6e8177fabcb33dac06142332add64a7dd Merge: 46c71b6 72aacbd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 20:28:06 2018 +0000 Merge remote-tracking branch 'gk/bug_26058' src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-)

1 0

[tor-launcher/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit f34580ab7e70487e5c97c67969326111ac00d074 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:37:46 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- src/chrome/content/network-settings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f86402d..0e18b29 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -304,10 +304,13 @@ function populateLocaleList(aLangPackAddons) let knownLanguages = { "en-US" : "English", "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", + "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", + "da" : "Dansk", "de" : "Deutsch", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", + "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", "ko" : "\ud55c\uad6d\uc5b4", @@ -315,9 +318,11 @@ function populateLocaleList(aLangPackAddons) "pl" : "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru" : "\u0420\u0443\u0441\u0441\u043a\u0438\u0439", + "sv" : "Svenska", "tr" : "T\u00fcrk\u00e7e", "vi" : "Ti\u1ebfng Vi\u1ec7t", - "zh-CN" : "\u7b80\u4f53\u5b57" + "zh-CN" : "\u7b80\u4f53\u5b57", + "zh-TW" : "\u6b63\u9ad4\u5b57" }; // Retrieve the current locale so we can select it within the list by default.

1 0

[torbutton/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 46c71b6a528e70386fb8165f7d1507615d1a2a47 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:04:05 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- trans_tools/import-translations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 83c2b6a..736d62f 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,14 +2,14 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN" +BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain # so Basque XPIs can be build independently. We can do # this for other languages too, if anyone requests this # and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv da" +BUNDLE_LOCALES="$BUNDLE_LOCALES eu" LOCALE_DIR=../src/chrome/locale

1 0

[tor-browser-build/master] Fold in older changelogs
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 6402ea66ab8ccc58870f09222a71caceeed4e41d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 19:03:17 2018 +0000 Fold in older changelogs --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 089cbad..4438a9d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 8.0a8 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + +Tor Browser 7.5.5 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + Tor Browser 8.0a7 -- May 9 2018 * All platforms * Update Firefox to 52.8.0esr @@ -14,6 +24,17 @@ Tor Browser 8.0a7 -- May 9 2018 * Linux * Bug 26010: Change Snowflake rendezvous to use the Azure domain front +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc

1 0

[tor-browser-build/maint-7.5] Picking up a -build2 from Mozilla
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit e2e0f83294692b6ff271ba073ad9ffa25fa5d02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 18:48:05 2018 +0000 Picking up a -build2 from Mozilla --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index cfafe70..0ed39da 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 gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 079c216..31b9cc1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/master] Bug 26440: move vaulted vars to a separate directory
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 2baf11975323cffae6a993fb5a2f57236f7c880d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 16:27:50 2018 +0200 Bug 26440: move vaulted vars to a separate directory --- tools/ansible/boklm-tbb-nightly-build.yml | 2 ++ .../ansible/{group_vars => vaulted_vars}/boklm-tbb-nightly/dma-auth.yml | 0 2 files changed, 2 insertions(+) diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index 2fe48cd..dd9e1dc 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -6,3 +6,5 @@ - role: tbb-nightly-build - role: unattended-upgrades - role: mta + vars_files: + - vaulted_vars/boklm-tbb-nightly/dma-auth.yml diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml similarity index 100% rename from tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml rename to tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml

1 0