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

[tor-browser-build/master] Bug 26949: Use GitHub repository for STIX
by gk＠torproject.org 26 Jul '18

26 Jul '18

commit cab964b173814a77f25bfd7ffa8d9adeff4d53fe Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 26 12:27:13 2018 -0400 Bug 26949: Use GitHub repository for STIX STIX moved away from SourceForge to GitHub breaking download during Tor Browser build; see https://lists.torproject.org/pipermail/tor-dev/2018-July/013357.html --- projects/fonts/build | 4 ++-- projects/fonts/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/… [View More]

1 0

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

25 Jul '18

commit 83eaa0098095411758e3042ffccedbc120c391f9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 24 12:11:09 2018 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. As part of the fix for #9145, we no longer need to set these preferences to disable hardware acceleration. --- 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.… [View More]

1 0

[tor-browser-build/master] Bug 9145: Tor Browser for Windows is broken with hardware acceleration
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 11e0e597480bbbd03410431107b26b0492c4fd83 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jun 23 11:21:44 2018 -0400 Bug 9145: Tor Browser for Windows is broken with hardware acceleration We now build with -DWIDL_EXPLICIT_AGGREGATE_RETURNS on Windows to fix this issue; see https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 for more information. --- projects/firefox/mozconfig-windows-i686 | 3 +++ projects/firefox/mozconfig-windows-x86_64 | 3 ++… [View More]

1 0

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

25 Jul '18

commit 51bc401c59cdaa7bf550a8ee955a27253285995e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 28 11:20:05 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 26237: Clean up toolbar for ESR60-based Tor Browser. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0981831a5c68..… [View More]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 095707f11202f4fd763853f446b0b0b3988da55c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jun 26 23:41:31 2018 -0700 fixup! Bug 2176: Rebrand Firefox to TorBrowser --- browser/branding/official/default128.png | Bin 12667 -> 20445 bytes browser/branding/official/default16.png | Bin 988 -> 1413 bytes browser/branding/official/default22.png | Bin 1262 -> 1740 bytes browser/branding/official/default24.png | Bin 1430 -> 1969 bytes browser/… [View More]branding/official/default256.png | Bin 29606 -> 48401 bytes browser/branding/official/default32.png | Bin 2145 -> 2907 bytes browser/branding/official/default48.png | Bin 5402 -> 5190 bytes browser/branding/official/default64.png | Bin 5168 -> 7805 bytes browser/branding/official/firefox64.ico | Bin 38630 -> 75112 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/official/default128.png b/browser/branding/official/default128.png index 84a9b6ff57c0..7113b0ae15cf 100644 Binary files a/browser/branding/official/default128.png and b/browser/branding/official/default128.png differ diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 59e34b3157d0..9a6f283b8f05 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png index be56b88fe5e9..a9ef81c47df0 100644 Binary files a/browser/branding/official/default22.png and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index 61c067fadf09..fdbbae3fdc0d 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index 0a73b8061245..1682f54b98fb 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index f4701edab65d..494951ce50d6 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index 5f445aea1a19..1b78e3b41967 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png index bc68d51b3f95..29cca7e1c881 100644 Binary files a/browser/branding/official/default64.png and b/browser/branding/official/default64.png differ diff --git a/browser/branding/official/firefox64.ico b/browser/branding/official/firefox64.ico index 4db9e72c7589..01fb0efda56d 100644 Binary files a/browser/branding/official/firefox64.ico and b/browser/branding/official/firefox64.ico differ [View Less]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26321: New Circuit and New Identity menu items
by gk＠torproject.org 25 Jul '18

25 Jul '18

commit 9eef59c878e596b64efff9eafb0cc4bcc38f680c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 23:56:44 2018 -0700 Bug 26321: New Circuit and New Identity menu items Placeholder menu items whose labels and commands are overridden by torbutton patch 26321. --- browser/base/content/browser-menubar.inc | 7 +++++++ browser/components/customizableui/content/panelUI.inc.xul | 8 ++++++++ 2 files changed, 15 insertions(+) diff --… [View More]git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index bbae987196c7..f10fc2f4072d 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -34,6 +34,13 @@ accesskey="&newPrivateWindow.accesskey;" command="Tools:PrivateBrowsing" key="key_privatebrowsing"/> + <menuseparator/> +  + <menuitem id="menu_newIdentity" + label="New Identity"/> + <menuitem id="menu_newCircuit" + label="New Tor Circuit for this Site"/> + <menuseparator/> #ifdef MAC_NON_BROWSER_WINDOW <menuitem id="menu_openLocation" label="&openLocationCmd.label;" diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index e44330108bb9..3aab2fd2587d 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -217,6 +217,14 @@ class="subviewbutton subviewbutton-iconic" command="Browser:RestoreLastSession"/> <toolbarseparator/> +  + <toolbarbutton id="appMenuNewIdentity" + label="New Identity" + class="subviewbutton subviewbutton-iconic"/> + <toolbarbutton id="appMenuNewCircuit" + label="New Tor Circuit for this Site" + class="subviewbutton subviewbutton-iconic"/> + <toolbarseparator/> <toolbaritem id="appMenu-zoom-controls" class="toolbaritem-combined-buttons" closemenu="none">  <spacer class="before-label"/> [View Less]

1 0

[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 … [View More]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"); +} [View Less]

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/… [View More]

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/… [View More]

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.… [View More]

1 0