- 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] 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] 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] 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] 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 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] 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