- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31450'
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 71eb0d2431d59ec06e4c1832df595fcd4a30cbf8 Merge: 82d382d 4767095 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 10 21:41:49 2019 +0200 Merge remote-tracking branch 'gk/bug_31450' projects/firefox/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31450: Setting proper BINDGEN_CFLAGS
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 56be840ce8e2c852bb040b39640db812a714a73b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 8 14:54:53 2019 +0000 Bug 31450: Setting proper BINDGEN_CFLAGS --- .mozconfig-asan | 1 + 1 file changed, 1 insertion(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index 04dd4373cd1f..8748f5825d3e 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-address-sanitizer ac_add_options --disable-jemalloc

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 82d382db0d7ca83896ae1bc75b3c923904f626b1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:38 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6fcd33a..f97cb65 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 9.0a6 -- September 4 2019 * All platforms * Update Firefox to 68.1.0esr

1 0

[tor-browser-build/master] Add missing item in 9.0a6 Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit ff6fd56b61cbd0773448845c1187fb62f9adb7f4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:01 2019 +0000 Add missing item in 9.0a6 Changelog --- 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 2cf1c5a..6fcd33a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 25214: Canvas data extraction on locale pdf file should be allowed * Bug 30657: Locale is leaked via title of link tag on non-html page * Bug 31015: Disabling SVG hides UI icons in extensions + * Bug 30538: Unable to comment on The Independent Newspaper * Bug 31357: Retire Tom's default obfs4 bridge * Windows + OS X + Linux * Update Tor to 0.4.1.5

1 0

[tor-browser-build/maint-8.5] Prepare 8.5.6 for Android
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 816407cfd7ee029b677e1b225d7faef255c51863 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 06:09:24 2019 +0000 Prepare 8.5.6 for Android Changelog update and version bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2d022aa..544cdd2 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") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 27d86a9..088b96d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 8.5.5 -- September 3 2019 * All platforms * Update Firefox to 60.9.0esr diff --git a/rbm.conf b/rbm.conf index 2a95652..6783d6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.5' - torbrowser_build: 'build2' + torbrowser_version: '8.5.6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.4 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.9.0esr-8.5-2] Pick up Torbutton 2.1.14
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 0e179ca39eabf6465b585d719832f3020e5df790 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 06:03:00 2019 +0000 Pick up Torbutton 2.1.14 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 850024dd1bef..6963d9bfe669 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 850024dd1bef30256f0ef443d4761aa43a3b84f6 +Subproject commit 6963d9bfe669dcb03ac23058c68989a74e3b7d1c

1 0

[torbutton/maint-2.1] Release prep for 2.1.14
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 6963d9bfe669dcb03ac23058c68989a74e3b7d1c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 05:59:06 2019 +0000 Release prep for 2.1.14 CHANGELOG update and version bump --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9435d991..17a8e15a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.1.14 + * Bug 31616: Do not enable JIT on aarch64 + 2.1.13 * Bug 31520: Remove monthly giving banner from Tor Browser * Bug 31140: Do not enable IonMonkey on AARCH64 diff --git a/src/install.rdf b/src/install.rdf index df859c72..dedb2c81 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1.13</em:version> + <em:version>2.1.14</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.1] Bug 31616: Fix JIT related crashes on aarch64
by gk＠torproject.org 08 Sep '19

08 Sep '19

commit 7d292d774a3605673c912b2d3a248b95c6fabcb1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 7 20:19:56 2019 +0000 Bug 31616: Fix JIT related crashes on aarch64 Patch by sysrqb. --- src/modules/security-prefs.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fb465a05..a0a4ad4d 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -47,9 +47,11 @@ const kCustomPref = "extensions.torbutton.security_custom"; var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( prefName => { - // Bug 31140 - Do not enable IonMonkey on AARCH64. + // Bug 31140 and 31616 - Do not enable JIT on aarch64. if (XPCOMABI.split("-")[0] == "aarch64" && - prefName == "javascript.options.ion") { + (prefName == "javascript.options.ion" || + prefName == "javascript.options.baselinejit" || + prefName == "javascript.options.native_regexp")) { setBoolPref(prefName, false); return; }

1 0

[torbutton/master] Bug 31562: Fix circuit display for error pages
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit bb975009a65ab9039641d03b11023fe6c52f5b7a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 5 17:56:08 2019 +0200 Bug 31562: Fix circuit display for error pages --- chrome/content/torbutton.js | 2 +- modules/utils.js | 49 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 9d6a5c48..94206ea5 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -850,7 +850,7 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let firstPartyDomain = getDomainForBrowser(gBrowser); + let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/modules/utils.js b/modules/utils.js index ea41fce9..0caf475f 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -4,9 +4,6 @@ // ### Import Mozilla Services const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -// ### About firstPartyDomain literal -const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; - // ## Pref utils // __prefs__. A shortcut to Mozilla Services.prefs. @@ -212,30 +209,34 @@ var show_torbrowser_manual = () => { return availableLocales.indexOf(shortLocale) >= 0; } +var getFPDFromHost = (hostname) => { + try { + return Services.eTLD.getBaseDomainFromHost(hostname); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { + return hostname; + } + } + return null; +} + +// Assuming this is called with gBrowser.selectedBrowser var getDomainForBrowser = (browser) => { - let firstPartyDomain = browser.contentPrincipal.originAttributes.firstPartyDomain; - // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param - if (firstPartyDomain === k_tb_about_uri_first_party_domain) { - let knownErrors = ["about:neterror", "about:certerror"]; - let origin = browser.contentPrincipal.origin || ''; - if (knownErrors.some(x => origin.startsWith(x))) { - try { - let urlOrigin = new URL(origin); - let { hostname } = new URL(urlOrigin.searchParams.get('u')); - if (hostname) { - try { - firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { - firstPartyDomain = hostname; - } - } - } - } catch (e) {} + let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; + // Bug 31562: For neterror or certerror, get the original URL from + // browser.currentURI and use it to calculate the firstPartyDomain. + let knownErrors = ["about:neterror", "about:certerror"]; + let documentURI = browser.documentURI; + if (documentURI && documentURI.schemeIs('about') && + knownErrors.some(x => documentURI.spec.startsWith(x))) { + let knownSchemes = ["http", "https", "ftp"]; + let currentURI = browser.currentURI; + if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { + fpd = getFPDFromHost(currentURI.host) || fpd; } } - return firstPartyDomain; + return fpd; }; // Export utility functions for external use.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31457: disable per-installation profiles
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 31d00e2f9c23184c2378d125c11a4e1219a8b59e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 4 08:23:19 2019 -0400 Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. --- browser/moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/moz.configure b/browser/moz.configure index 3057a5040c5f..43bc0c1fe59b 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -7,7 +7,7 @@ imply_option('MOZ_PLACES', True) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) +imply_option('MOZ_DEDICATED_PROFILES', False) imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) with only_when(target_is_linux & compile_environment):

1 0