- tbb-commits - lists.torproject.org

[torbutton/master] Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 25786da78e5646ddbccaee769a9356e0b4f39e42 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 14:47:25 2018 -0700 Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus This patch moves the menu items from the torbutton to the menubar and the app menu. Needs the 26321 patch in tor-browser.git. Also hides the "New Private Window" and "Restore Previous Session" items from the app menu. (Design by Pearl Crescent and Antonela Debiasi.) --- src/chrome.manifest | 1 + src/chrome/content/menu-items-overlay.xul | 29 +++++++++++++++++++++++++++++ src/chrome/content/popup.xul | 13 ------------- src/chrome/content/torbutton.js | 12 ++++++++---- src/chrome/skin/torbutton.css | 8 ++++++++ 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 7b57d399..18c5f5b9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -14,6 +14,7 @@ override chrome://branding/locale/brand.properties chrome://torbutton/locale/bra overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul # UI customization +overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul new file mode 100644 index 00000000..274c9c71 --- /dev/null +++ b/src/chrome/content/menu-items-overlay.xul @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>  + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="torbutton-menu-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <menuitem id="menu_newIdentity" + accesskey="&torbutton.context_menu.new_identity_key;" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <menuitem id="menu_newCircuit" + accesskey="&torbutton.context_menu.new_circuit_key;" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> + <toolbarbutton id="appMenuNewIdentity" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <toolbarbutton id="appMenuNewCircuit" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> + <toolbarbutton id="appMenu-private-window-button" + hidden="true"/> + <toolbarbutton id="appMenuRestoreLastSession" + hidden="true"/> +</overlay> diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index b088a829..b4191e30 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -15,19 +15,6 @@ anchor="torbutton-button" position="after_start" > <hbox align="start"> <vbox> - <menuitem id="torbutton-new-identity" - label="&torbutton.context_menu.new_identity;" - accesskey="&torbutton.context_menu.new_identity_key;" - key="torbutton-new-identity-key" - insertafter="context-stop" - oncommand="torbutton_new_identity()"/> - <menuitem id="torbutton-new-circuit" - label="&torbutton.context_menu.new_circuit;" - accesskey="&torbutton.context_menu.new_circuit_key;" - key="torbutton-new-circuit-key" - insertafter="context-stop" - oncommand="torbutton_new_circuit()"/> - <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 885a141a..18895927 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -949,7 +949,8 @@ function torbutton_new_identity() { try { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). - document.getElementById("torbutton-new-identity").disabled = true; + document.getElementById("menu_newIdentity").disabled = true; + document.getElementById("appMenuNewIdentity").disabled = true; let shouldConfirm = m_tb_prefs.getBoolPref("extensions.torbutton.confirm_newnym"); @@ -972,7 +973,8 @@ function torbutton_new_identity() { if (confirmed) { torbutton_do_new_identity(); } else { - document.getElementById("torbutton-new-identity").disabled = false; + document.getElementById("menu_newIdentity").disabled = false; + document.getElementById("appMenuNewIdentity").disabled = false; } } else { torbutton_do_new_identity(); @@ -980,7 +982,8 @@ function torbutton_new_identity() { } catch(e) { // If something went wrong make sure we have the New Identity button // enabled (again). - document.getElementById("torbutton-new-identity").disabled = false; + document.getElementById("menu_newIdentity").disabled = false; + document.getElementById("appMenuNewIdentity").disabled = false; torbutton_log(5, "Unexpected error on new identity: "+e); window.alert("Torbutton: Unexpected error on new identity: "+e); } @@ -1769,7 +1772,8 @@ function torbutton_check_protections() document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { - document.getElementById("torbutton-new-identity").disabled = true; + document.getElementById("menu_newIdentity").disabled = true; + document.getElementById("appMenuNewIdentity").disabled = true; } if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 14166b73..cf90ae6d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -59,3 +59,11 @@ svg#tor-circuit circle.node-circle { stroke-width: 2px; fill: white; } + +#appMenuNewIdentity { + list-style-image: url("chrome://browser/skin/reload.svg"); +} + +#appMenuNewCircuit { + list-style-image: url("chrome://torbutton/skin/relay.svg"); +}

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26353: Prevent speculative connect that violated FPI.
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit 1b1c4e4143d57a72e02464ac3bc343bd6d57ec9e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jul 14 08:50:55 2018 -0700 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. --- toolkit/components/remotebrowserutils/RemoteWebNavigation.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js b/toolkit/components/remotebrowserutils/RemoteWebNavigation.js index 9ca238359c0f..8f256f41953d 100644 --- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js +++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.js @@ -72,6 +72,10 @@ RemoteWebNavigation.prototype = { }, loadURIWithOptions(aURI, aLoadFlags, aReferrer, aReferrerPolicy, aPostData, aHeaders, aBaseURI, aTriggeringPrincipal) { +/******************************************************************************* + TOR BROWSER: Disable the following speculative connect until + we can make it properly obey first-party isolation. + // We know the url is going to be loaded, let's start requesting network // connection before the content process asks. // Note that we might have already setup the speculative connection in some @@ -95,6 +99,7 @@ RemoteWebNavigation.prototype = { // reason (such as failing to parse the URI), just ignore it. } } +*******************************************************************************/ this._sendMessage("WebNavigation:LoadURI", { uri: aURI, flags: aLoadFlags,

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Revert "Fix MAR generation bashism"
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit d94df634a18daca48ce92bf7ddff306a2b072f83 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 23 09:20:04 2018 +0000 Revert "Fix MAR generation bashism" This reverts commit 9ebb4cfb3d88543eac674bef8b72607cf29ce2d0. --- tools/update-packaging/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 79548dd4aa19..388d6b186367 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -218,7 +218,7 @@ list_files() { continue; fi eval "${1}[$count]=\"$file\"" - count=$((count + 1)) + (( count++ )) done <"${tmpfile}" rm -f "${tmpfile}" }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit 3ea5140e0bb662dee230a99c8fceaadb51e93ae1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 27 09:52:42 2018 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Part of the fix for #26216. --- tools/update-packaging/make_full_update.sh | 2 -- tools/update-packaging/make_incremental_update.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 9faa067da528..97e5fe221e40 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -8,8 +8,6 @@ # Author: Darin Fisher # -set -e - # shellcheck disable=SC1090 . "$(dirname "$0")/common.sh" diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 263ec5aa4a56..822ded71d949 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -8,8 +8,6 @@ # Author: Darin Fisher # -set -e - # shellcheck disable=SC1090 . "$(dirname "$0")/common.sh"

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 23 Jul '18

23 Jul '18

commit 3f03e30163c2117f5849a7fdc0f3b41b094eb8bd Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jul 14 23:37:06 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 26603: Remove obsolete http pipelining prefs --- browser/app/profile/000-tor-browser.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c3d83adf7d43..0981831a5c68 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -267,11 +267,6 @@ pref("javascript.options.asmjs", false); pref("gfx.font_rendering.graphite.enabled", false); // Network and performance -pref("network.http.pipelining", true); -pref("network.http.pipelining.aggressive", true); -pref("network.http.pipelining.maxrequests", 12); -pref("network.http.pipelining.ssl", true); -pref("network.http.proxy.pipelining", true); pref("security.ssl.enable_false_start", true); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256);

1 0

[tor-browser-build/master] Bug 26569: redirect pre-8.0a9 alpha users to a separate update directory
by gk＠torproject.org 19 Jul '18

19 Jul '18

commit 9756279736cde0363abc97f5e0eced6ffb627d37 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 11 12:47:32 2018 +0200 Bug 26569: redirect pre-8.0a9 alpha users to a separate update directory --- projects/release/update_responses_config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 92c2203..3f7ff41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,3 +47,8 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 +htaccess_rewrite_rules: + alpha: | + # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory + RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26569_v2'
by gk＠torproject.org 19 Jul '18

19 Jul '18

commit fd7ecf819ad87e948de62b7328472a1857748bde Merge: ed17557 9756279 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 19 09:43:04 2018 +0000 Merge remote-tracking branch 'boklm/bug_26569_v2' projects/release/update_responses_config.yml | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor-browser-build/master] Bug 26477: Make meek extension compatible with ESR 60
by gk＠torproject.org 18 Jul '18

18 Jul '18

commit ed1755732939ec95b14b501eb82c799b7756ef2a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 18 19:35:26 2018 +0000 Bug 26477: Make meek extension compatible with ESR 60 --- projects/meek/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/config b/projects/meek/config index f58fbd1..7d0fd2d 100644 --- a/projects/meek/config +++ b/projects/meek/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.29 +version: 0.31 git_url: https://git.torproject.org/pluggable-transports/meek.git git_hash: '[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 26795: Bump snowflake to 6077141f4a for #25600.
by gk＠torproject.org 18 Jul '18

18 Jul '18

commit f64781d4b36aa8cc6e222b1c028853e28f6089fd Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 15 17:21:47 2018 -0700 Bug 26795: Bump snowflake to 6077141f4a for #25600. This works around a hang in the client that occurred once it had logged a certain amount of information to its stderr. Now, if not logging to a file, snowflake-client will log nothing rather than writing to stderr. The corresponding tor bug is #26360. --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 8e3296c..c9a84b3 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 1114acbcb4acb82174b293983ced8afcaf9e2a93 +git_hash: 6077141f4affdab9b7ce97a9b1c6859825eaaa29 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[torbutton/master] Bug 26590: Use new svg.disabled pref in security slider
by gk＠torproject.org 17 Jul '18

17 Jul '18

commit 54c64d2ea862873a42e6049e2e1aa2bc4a5b2b27 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 16 10:28:09 2018 -0700 Bug 26590: Use new svg.disabled pref in security slider Updates from Tor Browser's old "svg.in-content.enabled" pref to Firefox's new built-in "svg.disabled". --- src/modules/security-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index d269a1fc..fa97b70d 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -27,7 +27,7 @@ const kSecuritySettings = { "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], - "svg.in-content.enabled" : [, false, true, true, true ], + "svg.disabled" : [, true, false, false, false], }; // The Security Settings prefs in question.

1 0

[tor-browser-build/master] Bug 26355: update tbb-windows-installer to check for Windows7+
by boklm＠torproject.org 13 Jul '18

13 Jul '18

commit 7903f5828c835e52722101a83450bbeb29fc2007 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jul 13 09:59:14 2018 +0200 Bug 26355: update tbb-windows-installer to check for Windows7+ We also update keyring/tbb-windows-installer.gpg as Moritz is using a new key for signing the tag: 7A3D AD44 08A0 009B 4DE9 C855 858E E1C3 B8A4 568D --- keyring/tbb-windows-installer.gpg | Bin 107882 -> 7231 bytes projects/tbb-windows-installer/config | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/keyring/tbb-windows-installer.gpg b/keyring/tbb-windows-installer.gpg index 6923786..343c69e 100644 Binary files a/keyring/tbb-windows-installer.gpg and b/keyring/tbb-windows-installer.gpg differ diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 0de570e..57c4fda 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.3.1 +version: 0.4 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 26773: Add --verbose to the ./mach build flag for firefox for better debugging via log files.
by boklm＠torproject.org 12 Jul '18

12 Jul '18

commit dad9578655af92b3405d4f09891847da4c208f92 Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Jul 12 13:44:31 2018 -0500 Bug 26773: Add --verbose to the ./mach build flag for firefox for better debugging via log files. Does not affect the console output, will use more disk space in log files. --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1921f53..da1e71b 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -142,7 +142,7 @@ rm -f configure rm -f js/src/configure ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts -./mach build +./mach build --verbose ./mach build stage-package [% IF c("var/osx") %]

1 0

[tor-browser-build/master] Bug 26773: Add another build error FAQ
by boklm＠torproject.org 12 Jul '18

12 Jul '18

commit 2b2e744357cef8ce1e847bafc1f9a73f4337aed4 Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Jul 12 13:49:32 2018 -0500 Bug 26773: Add another build error FAQ --- README.BUILD_ERRORS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 68333d5..03f2450 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -29,6 +29,20 @@ $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- + +If you have an error like this: + +---- +Error: Error starting remote: +could not synchronise with container process: no subsystem for mount +---- + +You may be experiencing a similar but different problem. Anecdotally +this occured on Ubuntu 18.04 Bionic, kernel 4.15.0-24-generic. You need +to add systemd.legacy_systemd_cgroup_controller=1 to the kernel +boot commandline in /etc/default/grub (followed by `sudo update-grub`). + + Error during debootstrap image creation ---------------------------------------

1 0

[tor-browser-build/master] Merge remote-tracking branch 'azadi/bug-26251-rev1'
by boklm＠torproject.org 11 Jul '18

11 Jul '18

commit 82a0bd2d85fe53b61460a3e3b833f10a0bb01519 Merge: 6d63b2e 6d3f0f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 11 12:58:51 2018 +0200 Merge remote-tracking branch 'azadi/bug-26251-rev1' projects/webrtc/build | 10 ++++----- projects/webrtc/webrtc-mac.patch | 45 ++-------------------------------------- rbm.conf | 2 +- 3 files changed, 8 insertions(+), 49 deletions(-)

1 0

[tor-browser-build/master] Bug 26251: Adapt macOS snowflake compilation to new toolchain
by boklm＠torproject.org 11 Jul '18

11 Jul '18

commit 6d3f0f5dfbec918368f3114ff96fdeb308c9d7a9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 20 07:32:27 2018 -0400 Bug 26251: Adapt macOS snowflake compilation to new toolchain This commit adds support for building Snowflake (and its associated components, webrtc and go-webrtc) with our updated toolchain that uses clang 3.9.1 and macOS SDK 10.11 For clang, we add the '-Wno-unknown-warning-option' flag; see https://bugs.llvm.org/show_bug.cgi?id=24979 for more information. --- projects/webrtc/build | 10 ++++----- projects/webrtc/webrtc-mac.patch | 45 ++-------------------------------------- rbm.conf | 2 +- 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 43b8261..32a66b7 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -13,8 +13,8 @@ mkdir -p /var/tmp/dist [% END -%] [% IF c("var/osx") -%] # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". - ln -sf x86_64-apple-darwin10-libtool $cctoolsdir/libtool - export AR=x86_64-apple-darwin10-ar + ln -sf x86_64-apple-darwin11-libtool $cctoolsdir/libtool + export AR=x86_64-apple-darwin11-ar # Certain cross-compiling flags are set in webrtc-mac.patch because the build # system doesn't honor CFLAGS etc. environment variables. [% ELSE -%] @@ -63,14 +63,14 @@ cd $builddir # needs to be kept in sync with the SDK version. cat <<EOF > build/mac/find_sdk.py print("$sysrootdir") -print("10.7") +print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py print("machine_os_build=\"10.7\"") -print("sdk_build=\"10.7\"") +print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") -print("sdk_version=\"10.7\"") +print("sdk_version=\"10.11\"") print("xcode_build=\"7.3\"") print("xcode_version=\"0730\"") EOF diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch index 5c9cedd..6b888bb 100644 --- a/projects/webrtc/webrtc-mac.patch +++ b/projects/webrtc/webrtc-mac.patch @@ -60,8 +60,8 @@ index 84180e6a..2054b46f 100644 sysroot, "-mmacosx-version-min=$mac_deployment_target", + "-target", -+ "x86_64-apple-darwin10", -+ "-mlinker-version=136", ++ "x86_64-apple-darwin11", ++ "-Wno-unknown-warning-option", + "-B", + "/var/tmp/dist/macosx-toolchain/cctools/bin", ] @@ -136,47 +136,6 @@ index 0928fa13..898edc1a 100644 -- 2.11.0 -From d9577991412310d3313d9dcd86453ce24f845c2e Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:37:34 -0700 -Subject: [PATCH 4/8] Hack workaround to disable dispatch_queue_get_label. - -dispatch_queue_get_label and DISPATCH_CURRENT_QUEUE_LABEL require SDK -10.9+. I don't know if removing this code even makes sense, but it at -least won't crash immediately because of a null pointer. - -https://developer.apple.com/documentation/dispatch/dispatch_current_queue_label -https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/General.html - -FAILED: obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o ../../../../clang/bin/clang++ -MMD -MF obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o.d -DV8_DEPRECATION_WARNINGS -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_XCODE_VERSION=0730 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DWEBRTC_POSIX -DWEBRTC_MAC -I../.. -Igen -fno-strict-aliasing -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -arch x86_64 -Wall -Wpartial-availability -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -O2 -gdwarf-2 -isysroot /home/debian/build/MacOSX10.7.sdk -mmacosx-version-min=10.9 -targ et x86_64-apple-darwin10 -mlinker-version=136 -B /home/debian/build/cctools/bin -fvisibility=hidden -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-overflow -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -Wno-narrowing -fno-rtti -fno-exceptions -Wnon-virtual-dtor -Woverloaded-virtual -c ../../webrtc/base/sequenced_task_checker_impl.cc -o obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o -warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] -../../webrtc/base/sequenced_task_checker_impl.cc:34:46: error: use of undeclared identifier 'DISPATCH_CURRENT_QUEUE_LABEL' - current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); - ^ ---- - webrtc/base/sequenced_task_checker_impl.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/webrtc/base/sequenced_task_checker_impl.cc b/webrtc/base/sequenced_task_checker_impl.cc -index f03e0b679..352b2162d 100644 ---- a/webrtc/base/sequenced_task_checker_impl.cc -+++ b/webrtc/base/sequenced_task_checker_impl.cc -@@ -30,8 +30,9 @@ bool SequencedTaskCheckerImpl::CalledSequentially() const { - #if defined(WEBRTC_MAC) - // If we're not running on a TaskQueue, use the system dispatch queue - // label as an identifier. -- if (current_queue == nullptr) -- current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); -+ // Disable this because dispatch_queue_get_label requires SDK 10.9+. -+ // if (current_queue == nullptr) -+ // current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); - #endif - CritScope scoped_lock(&lock_); - if (!attached_) { // true if previously detached. --- -2.11.0 - - From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Mon, 26 Jun 2017 11:41:16 -0700 diff --git a/rbm.conf b/rbm.conf index de5102d..bea9d3e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -245,7 +245,7 @@ targets: LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac # We only build snowflake for linux on the alpha and nightly channels for now. - snowflake: 0 #'[% c("var/alpha") || c("var/nightly") %]' + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 06 Jul '18

06 Jul '18

commit 6d63b2ee1e3bfd0479ddc9abef9ae94eb097a668 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 6 12:37:02 2018 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 516e81f..b8d30f1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -86,6 +86,23 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25540: Stop building and distributing sandboxed tor browser * Bug 25481: Rust support for tor-browser and tor +Tor Browser 7.5.6 -- June 26 2018 + * All platforms + * Update Firefox to 52.9.0esr + * 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.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) + * Bug 25721: Backport patches from Mozilla's bug 1448771 + * Bug 25147+25458: Sanitize HTML fragments for chrome documents + * Bug 26221: Backport fix for leak in SHA256 in nsHttpConnectionInfo.cpp + * Windows + * Bug 26424: Disable UNC paths to prevent possible proxy bypasses + Tor Browser 8.0a8 -- June 10 2018 * All platforms * Update Firefox to 52.8.1esr

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 859782 - Firefox cannot start without /proc (chroot). r=sfink, evilpie, jld
by gk＠torproject.org 04 Jul '18

04 Jul '18

commit dbca4ee64600d9ab17e7c9abdc7dac76562def01 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 19 08:00:58 2018 -0600 Bug 859782 - Firefox cannot start without /proc (chroot). r=sfink,evilpie,jld Firefox uses the current stack frame address and the stack size as a sort of heuristic for various things in the javascript engine. The js::GetNativeStackBaseImpl() function is used to get the base stack address (ie the address from which the stack grows, so this can be either the first or last memory address of the stack memory space depending on the CPU architecture). On Linux, this function is implemented using the pthreads APIs. For non-main threads, the queried thread info is stored in memory. The main thread does not have this information on hand, so it gets the stack memory range via the /proc/self/maps file ( see glibc's pthread_get_attr_np.c ). Fortunately (per discussions with the firefox devs in #jsapi) the base address only needs to be approximation. In reality, environment variables, args, and other things are stored in space between the end/beginning of the mapped stack memory and the 'top' of the stack space used by stack frames. We can get the top of this usable stack from __libc_stack_end, which is a void* set by glibc during program initialization. Non-main threads still get their stack-base through the usual pthreads APIs. This fixes bug 20283 on our side. --- js/src/util/NativeStack.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp index 2507374a36da..300b5259b5e5 100644 --- a/js/src/util/NativeStack.cpp +++ b/js/src/util/NativeStack.cpp @@ -13,10 +13,24 @@ # if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) # include <pthread_np.h> # endif +# if defined(SOLARIS) || defined(AIX) +# include <ucontext.h> +# endif # if defined(ANDROID) && !defined(__aarch64__) # include <sys/types.h> # include <unistd.h> # endif +# if defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) +# include <dlfcn.h> +# include <sys/syscall.h> +# include <sys/types.h> +# include <unistd.h> +static pid_t +gettid() +{ + return syscall(__NR_gettid); +} +# endif #else # error "Unsupported platform" #endif @@ -34,8 +48,6 @@ js::GetNativeStackBaseImpl() #elif defined(SOLARIS) -#include <ucontext.h> - JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0); void* @@ -48,8 +60,6 @@ js::GetNativeStackBaseImpl() #elif defined(AIX) -#include <ucontext.h> - JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0); void* @@ -61,6 +71,52 @@ js::GetNativeStackBaseImpl() context.uc_stack.ss_size; } +#elif defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) +void* +js::GetNativeStackBaseImpl() +{ + + // On the main thread, get stack base from glibc's __libc_stack_end rather than pthread APIs + // to avoid filesystem calls /proc/self/maps. Non-main threads spawned with pthreads can read + // this information directly from their pthread struct, but the main thread must go parse + // /proc/self/maps to figure the mapped stack address space ranges. We want to avoid reading + // from /proc/ so that firefox can run in sandboxed environments where /proc may not be mounted + if (gettid() == getpid()) { + void** pLibcStackEnd = (void**)dlsym(RTLD_DEFAULT, "__libc_stack_end"); + + // If __libc_stack_end is not found, architecture specific frame pointer hopping will need + // to be implemented. + MOZ_RELEASE_ASSERT(pLibcStackEnd, "__libc_stack_end unavailable, unable to setup stack range for JS"); + void* stackBase = *pLibcStackEnd; + MOZ_RELEASE_ASSERT(stackBase, "invalid stack base, unable to setup stack range for JS"); + + // We don't need to fix stackBase, as it already roughly points to beginning of the stack + return stackBase; + } + + // Non-main threads have the required info stored in memory, so no filesystem calls are made. + pthread_t thread = pthread_self(); + pthread_attr_t sattr; + pthread_attr_init(&sattr); + pthread_getattr_np(thread, &sattr); + + // stackBase will be the *lowest* address on all architectures. + void* stackBase = nullptr; + size_t stackSize = 0; + int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize); + if (rc) { + MOZ_CRASH("call to pthread_attr_getstack failed, unable to setup stack range for JS"); + } + MOZ_RELEASE_ASSERT(stackBase, "invalid stack base, unable to setup stack range for JS"); + pthread_attr_destroy(&sattr); + +# if JS_STACK_GROWTH_DIRECTION > 0 + return stackBase; +# else + return static_cast<char*>(stackBase) + stackSize; +# endif +} + #else /* XP_UNIX */ void*

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Revert "Bug 20283: Tor Browser should run without a `/proc` filesystem."
by gk＠torproject.org 04 Jul '18

04 Jul '18

commit 2edb3478a22331e0fc882e25874b9403ee2575ee Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 4 16:51:23 2018 +0000 Revert "Bug 20283: Tor Browser should run without a `/proc` filesystem." This reverts commit 5bd6e492edc3fc4df748d1228360c80fee38e276. --- js/src/util/NativeStack.cpp | 60 +++------------------------------------------ 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp index a695cb3bcd6c..2507374a36da 100644 --- a/js/src/util/NativeStack.cpp +++ b/js/src/util/NativeStack.cpp @@ -13,24 +13,10 @@ # if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) # include <pthread_np.h> # endif -# if defined(SOLARIS) || defined(AIX) -# include <ucontext.h> -# endif # if defined(ANDROID) && !defined(__aarch64__) # include <sys/types.h> # include <unistd.h> # endif -# if defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) -# include <dlfcn.h> -# include <sys/syscall.h> -# include <sys/types.h> -# include <unistd.h> -static pid_t -gettid() -{ - return syscall(__NR_gettid); -} -# endif #else # error "Unsupported platform" #endif @@ -48,6 +34,8 @@ js::GetNativeStackBaseImpl() #elif defined(SOLARIS) +#include <ucontext.h> + JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0); void* @@ -60,6 +48,8 @@ js::GetNativeStackBaseImpl() #elif defined(AIX) +#include <ucontext.h> + JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0); void* @@ -71,48 +61,6 @@ js::GetNativeStackBaseImpl() context.uc_stack.ss_size; } -#elif defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) -void* -js::GetNativeStackBaseImpl() -{ - // On the main thread, get stack base from glibc's __libc_stack_end rather than pthread APIs - // to avoid filesystem calls /proc/self/maps. Non-main threads spawned with pthreads can read - // this information directly from their pthread struct, but the main thread must go parse - // /proc/self/maps to figure the mapped stack address space ranges. We want to avoid reading - // from /proc/ so that firefox can run in sandboxed environments where /proc may not be mounted - if (gettid() == getpid()) { - void** pLibcStackEnd = (void**)dlsym(RTLD_DEFAULT, "__libc_stack_end"); - // If __libc_stack_end is not found, architecture specific frame pointer hopping will need - // to be implemented. - MOZ_RELEASE_ASSERT(pLibcStackEnd, "__libc_stack_end unavailable, unable to setup stack range for JS"); - void* stackBase = *pLibcStackEnd; - MOZ_RELEASE_ASSERT(stackBase, "invalid stack base, unable to setup stack range for JS"); - // We don't need to fix stackBase, as it already roughly points to beginning of the stack - return stackBase; - } else { - // Non-main threads have the required info stored in memory, so no filesystem calls are made. - pthread_t thread = pthread_self(); - pthread_attr_t sattr; - pthread_attr_init(&sattr); - pthread_getattr_np(thread, &sattr); - // stackBase will be the *lowest* address on all architectures. - void* stackBase = nullptr; - size_t stackSize = 0; - int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize); - if (rc) { - MOZ_CRASH("call to pthread_attr_getstack failed, unable to setup stack range for JS"); - } - MOZ_RELEASE_ASSERT(stackBase, "invalid stack base, unable to setup stack range for JS"); - pthread_attr_destroy(&sattr); - -# if JS_STACK_GROWTH_DIRECTION > 0 - return stackBase; -# else - return static_cast<char*>(stackBase) + stackSize; -# endif - } -} - #else /* XP_UNIX */ void*

1 0

[fpcentral/master] Bug 26623: recognize esr60 versions of Tor Browser
by gk＠torproject.org 04 Jul '18

04 Jul '18

commit a88dbe42b1478ba4a2142c3c8ae08d80511a7f73 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jul 3 19:44:23 2018 +0200 Bug 26623: recognize esr60 versions of Tor Browser --- fingerprint/acceptable/torbrowser80.json | 64 ++++++++++++++++++++++++++++++++ fingerprint/tags/browser.py | 9 ++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/fingerprint/acceptable/torbrowser80.json b/fingerprint/acceptable/torbrowser80.json new file mode 100644 index 0000000..4c6522e --- /dev/null +++ b/fingerprint/acceptable/torbrowser80.json @@ -0,0 +1,64 @@ +{ + "mainTag": "Tor Browser 8.0", + "math": { + "asinh(1)": 0.8813735870195429, + "acosh(1e300)": "Infinity", + "atanh(05)": 0.5493061443340548, + "expm1(1)": 1.7182818284590455, + "cbrt(100)": 4.641588833612778, + "log1p(10)": 2.3978952727983707, + "sinh(1)": 1.1752011936438016, + "cosh(10)": 11013.232920103324, + "tanh(1)": 0.7615941559557649 + }, + "plugins": "", + "dnt": "NC", + "buildID": "20100101", + "screen": { + "width": [1000,800,600,400,200], + "height": [1000,900,800,700,600,500,400,300,200], + "depth": 24, + "availTop": 0, + "availLeft": 0, + "availHeight": [1000,900,800,700,600,500,400,300,200], + "availWidth": [1000,800,600,400,200], + "left": 0, + "top": 0 + }, + "storage": { + "local": "yes", + "session": "yes" + }, + "timezone": 0, + "cookies": "yes", + "platform": "Win32", + "Accept-Encoding": "gzip, deflate, br", + "Accept-Language": "en-US,en;q=0.5", + "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", + "Content-Type": "", + "Content-Length": "", + "audio": { + "nt_vc_output": { + "ac-sampleRate": 0, + "ac-state": 0, + "ac-maxChannelCount": 0, + "ac-numberOfInputs": 0, + "ac-numberOfOutputs": 0, + "ac-channelCount": 0, + "ac-channelCountMode": 0, + "ac-channelInterpretation": 0, + "an-fftSize": 0, + "an-frequencyBinCount": 0, + "an-minDecibels": 0, + "an-maxDecibels": 0, + "an-smoothingTimeConstant": 0, + "an-numberOfInputs": 0, + "an-numberOfOutputs": 0, + "an-channelCount": 0, + "an-channelCountMode": 0, + "an-channelInterpretation": 0 + }, + "pxi_output": 0, + "pxi_full_buffer_hash": "158e8189a3551fe4f2e564ac377b0f1e588a1ab3" + } +} diff --git a/fingerprint/tags/browser.py b/fingerprint/tags/browser.py index 405b8c8..daae5c1 100644 --- a/fingerprint/tags/browser.py +++ b/fingerprint/tags/browser.py @@ -5,6 +5,7 @@ tor4 = "Tor 4.X" tor5 = "Tor 5.X" tor6 = "Tor 6.X" torbrowser70 = "Tor Browser 7.0" +torbrowser80 = "Tor Browser 8.0" chrome = "Chrome" firefox = "Firefox" #NB: A Tor browser cannot have the Firefox tag edge = "Edge" @@ -20,7 +21,13 @@ class Browser(Tag): def checkTags(self, fp): ua = fp["User-Agent"] #We check first for UA from Tor browsers - if ua == "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0": + if ua == "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0": + return [torbrowser80] + elif ua == "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0": + return [torbrowser80] + elif ua == "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0": + return [torbrowser80] + elif ua == "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0": return [torbrowser70] elif ua == "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0": return [tor6]

1 0

[tor-browser-build/master] Bug 26039: FIXUP <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 8cfb90c7f21a220378adaaa8f5f54ce0e9cccb39 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 26 11:06:57 2018 -0700 Bug 26039: FIXUP <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60 Fixup for 26039. WebExtension extensions can't read/write prefs, so the base contents of extension-overrides.js are completely unnecessary. The WebExtension versions of noscript and httpseverywhere seem to be nearly complete re-writes (noscript in particular is much simpler) so our custom options appear to be no longer required (though a complete audit of noscript should probably be done just to be sure we don't need to fix any bad behaviour). The updated build script for tor-browser now dumps all of the build-determined prefs (pluggable transport strings, localization options) into a generated-prefs.js file created at build time, which is then appended to 000-tor-browser.js as before. The pdfjs option is no longer needed since the disableRange option seems to break pdfjs altogether in latest ESR60. Also, setting the user pref in 000-tor-browser.js does not work since pdfjs overwrites it with its own value (any future patch setting pdfjs options needs to modify the default values table) --- .../Bundle-Data/PTConfigs/extension-overrides.js | 63 ---------------------- projects/tor-browser/build | 16 +++--- 2 files changed, 9 insertions(+), 70 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js b/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js deleted file mode 100644 index c81a7bf..0000000 --- a/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js +++ /dev/null @@ -1,63 +0,0 @@ -# Overrides for Extension Preferences -# Tor Browser Bundle -# Do not edit this file. - -# HTTPS Everywhere Preferences: -pref("extensions.https_everywhere._observatory.popup_shown", true); -pref("extensions.https_everywhere.toolbar_hint_shown", true); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.ABE.enabled", false); -pref("noscript.ABE.notify", false); -pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.confirmUnblock", false); -pref("noscript.contentBlocker", true); -pref("noscript.firstRunRedirection", false); -pref("noscript.global", true); -pref("noscript.gtemp", ""); -pref("noscript.opacizeObject", 3); -pref("noscript.forbidWebGL", true); -pref("noscript.forbidFonts", false); -pref("noscript.options.tabSelectedIndexes", "5,0,0"); -pref("noscript.policynames", ""); -pref("noscript.secureCookies", true); -pref("noscript.showAllowPage", false); -pref("noscript.showBaseDomain", false); -pref("noscript.showDistrust", false); -pref("noscript.showRecentlyBlocked", false); -pref("noscript.showTemp", false); -pref("noscript.showTempToPerm", false); -pref("noscript.showUntrusted", false); -pref("noscript.STS.enabled", false); -pref("noscript.subscription.lastCheck", -142148139); -pref("noscript.temp", ""); -pref("noscript.untrusted", ""); -pref("noscript.forbidMedia", false); -pref("noscript.allowWhitelistUpdates", false); -pref("noscript.fixLinks", false); -// Now handled by plugins.click_to_play -pref("noscript.forbidFlash", false); -pref("noscript.forbidSilverlight", false); -pref("noscript.forbidJava", false); -pref("noscript.forbidPlugins", false); -// Usability tweaks -pref("noscript.showPermanent", false); -pref("noscript.showTempAllowPage", true); -pref("noscript.showRevokeTemp", true); -pref("noscript.notify", false); -pref("noscript.autoReload", true); -pref("noscript.autoReload.allTabs", false); -pref("noscript.cascadePermissions", true); -pref("noscript.restrictSubdocScripting", true); -pref("noscript.showVolatilePrivatePermissionsToggle", false); -pref("noscript.volatilePrivatePermissions", true); -pref("noscript.clearClick", 0); - -# PDF.js -// needs to be a user_pref because pdf.js blows away non-user prefs with its own -// defaults each time -user_pref("pdfjs.disableRange", true); diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 50fdc30..5456ad1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -12,7 +12,9 @@ mkdir -p $OUTDIR # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=$distdir/tor-browser-stage -EXTOVERRIDESPATH=$rootdir/Bundle-Data/PTConfigs/extension-overrides.js +GENERATEDPREFSPATH=$rootdir/Bundle-Data/PTConfigs/generated-prefs.js +# Create initially empty prefs file where we can dump our conditionally included/genetered prefs +touch "$GENERATEDPREFSPATH" [% IF c("var/osx") %] TBDIR="$TB_STAGE_DIR/Tor Browser.app" @@ -113,9 +115,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T [% IF c("var/linux") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$EXTOVERRIDESPATH" + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% END %] [% END -%] [% IF c("var/windows") -%] @@ -123,13 +125,13 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T # We don't have fte available on Windows x86_64 yet grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" @@ -143,7 +145,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u [% END %] [% IF ! c("var/multi_lingual") %] - echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$EXTOVERRIDESPATH" + echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" [% END %] [% IF c("var/linux") %] @@ -171,7 +173,7 @@ mv chrome/en-US/locale/browser/searchplugins $rootdir rm -rf chrome/en-US unzip omni.ja defaults/preferences/000-tor-browser.js || [ $? -lt 3 ] # Append our built extension-overrides.js to 000-tor-browser.js -cat "$EXTOVERRIDESPATH" >> defaults/preferences/000-tor-browser.js +cat "$GENERATEDPREFSPATH" >> defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js $rootdir [% IF c("var/osx") %] # Embed our default bookmarks within the en-US locale.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26450'
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 71207ea2468a8535e73dc8e8aa09aecfedbbed34 Merge: 660007a 88ff600 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:33:04 2018 +0000 Merge remote-tracking branch 'boklm/bug_26450' projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 26450: disable dependency on firefox-langpacks in testbuild
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 88ff6003f2d8b45aca111e2f7cfcce3837fe5414 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 22 00:09:30 2018 +0200 Bug 26450: disable dependency on firefox-langpacks in testbuild When the list of locales is empty (testbuild), we don't need the firefox-langpacks. --- projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 820755c..13c550d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,7 @@ input_files: name: tor - project: firefox-langpacks name: firefox-langpacks + enable: '[% c("var/locales").size %]' - project: tor-launcher name: tor-launcher - project: torbutton

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26410'
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 660007aa541e3c8cc4fda2776e8a277fdbc74915 Merge: c2f11e3 2846221 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:29:06 2018 +0000 Merge remote-tracking branch 'boklm/bug_26410' Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser-build/master] Bug 26410: Stop using old MAR format in the next esr60-based alpha
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 2846221abfaeb05837e7d4a2056741df555dbd5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 28 14:29:24 2018 +0200 Bug 26410: Stop using old MAR format in the next esr60-based alpha However we keep setting MAR_OLD_FORMAT=1 on the stable release for now. --- Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3b5c2d9..b667960 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ incrementals-release: submodule-update incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha update_responses-release: submodule-update @@ -138,9 +138,9 @@ dmg2mar-release: submodule-update dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed + $(rbm) build release --step dmg2mar --target alpha --target signed tools/update-responses/download_missing_versions alpha - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha submodule-update: git submodule update --init diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 0c3e583..50fdc30 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -264,9 +264,11 @@ popd cd $distdir [% IF c("var/build_mar") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 + [% IF c("var/release") -%] + # Let's use the bzip2 format for now so that users can update to the first + # esr60-based Tor Browser. + export MAR_OLD_FORMAT=1 + [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/master] Fix HTTPS Everywhere version in the changelog
by boklm＠torproject.org 29 Jun '18

29 Jun '18

commit c2f11e3720f2a5429f4cd32af73b94d655002712 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 29 12:32:39 2018 +0200 Fix HTTPS Everywhere version in the changelog Reported in a comment on the blog: https://blog.torproject.org/comment/275985#comment-275985 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5f52bbe..516e81f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,7 +20,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 20890: Increase control port connection timeout * Bug 20628: Add more locales to Tor Browser * Translations update - * Update HTTPS Everywhere to 2018.6.13 + * Update HTTPS Everywhere to 2018.6.21 * Update NoScript to 10.1.8.2 * Bug 25543: Rebase Tor Browser patches for ESR60 * Bug 23247: Show security state of .onions

1 0