- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 24 Oct '19

24 Oct '19

commit 5d24d4b6873de2da8afa7cba448905522311a4b8 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 23 13:43:41 2019 -0700 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor Fixes bug 32210 (hiding the tor pane when using system tor) --- browser/components/preferences/in-content/preferences.js | 9 ++++++++- browser/components/torpreferences/content/torCategory.inc.xul | 3 ++- browser/components/torpreferences/content/torPane.js | 5 +++++ browser/components/torpreferences/content/torPane.xul | 3 ++- browser/modules/TorProtocolService.jsm | 10 ++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js index 04e4f53b312a..9c97c33a8b2a 100644 --- a/browser/components/preferences/in-content/preferences.js +++ b/browser/components/preferences/in-content/preferences.js @@ -93,7 +93,14 @@ function init_all() { document.getElementById("template-paneSync").remove(); } register_module("paneSearchResults", gSearchResultsPane); - register_module("paneTor", gTorPane); + if (gTorPane.enabled) { + document.getElementById("category-tor").hidden = false; + register_module("paneTor", gTorPane); + } else { + // Remove the pane from the DOM so it doesn't get incorrectly included in search results. + document.getElementById("template-paneTor").remove(); + } + gSearchResultsPane.init(); gMainPane.preInit(); diff --git a/browser/components/torpreferences/content/torCategory.inc.xul b/browser/components/torpreferences/content/torCategory.inc.xul index 746059358d5f..abe56200f571 100644 --- a/browser/components/torpreferences/content/torCategory.inc.xul +++ b/browser/components/torpreferences/content/torCategory.inc.xul @@ -2,7 +2,8 @@ class="category" value="paneTor" helpTopic="prefs-tor" - align="center"> + align="center" + hidden="true"> <image class="category-icon"/> <label id="torPreferences-labelCategory" class="category-name" flex="1" value="Tor"/> </richlistitem> diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 08de0613e1d4..334155e91a59 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -478,6 +478,11 @@ const gTorPane = (function() { this._populateXUL(); }, + // whether the page should be present in about:preferences + get enabled() { + return TorProtocolService.ownsTorDaemon; + }, + // // Callbacks // diff --git a/browser/components/torpreferences/content/torPane.xul b/browser/components/torpreferences/content/torPane.xul index b384ce9f9489..5d8451554eb9 100644 --- a/browser/components/torpreferences/content/torPane.xul +++ b/browser/components/torpreferences/content/torPane.xul @@ -2,7 +2,7 @@ <script type="application/javascript" src="chrome://browser/content/torpreferences/torPane.js"/> - +<html:template id="template-paneTor"> <hbox id="torPreferencesCategory" class="subcategory" hidden="true" @@ -117,3 +117,4 @@ <button id="torPreferences-buttonTorLogs" class="torMarginFix" oncommand="gTorPane.onViewTorLogs();"/> </hbox> </groupbox> +</html:template> \ No newline at end of file diff --git a/browser/modules/TorProtocolService.jsm b/browser/modules/TorProtocolService.jsm index 48ae2e14ec64..b4e6ed9a3253 100644 --- a/browser/modules/TorProtocolService.jsm +++ b/browser/modules/TorProtocolService.jsm @@ -2,10 +2,15 @@ var EXPORTED_SYMBOLS = ["TorProtocolService"]; +const { TorLauncherUtil } = ChromeUtils.import( + "resource://torlauncher/modules/tl-util.jsm" +); + var TorProtocolService = { _tlps: Cc["@torproject.org/torlauncher-protocol-service;1"].getService( Ci.nsISupports ).wrappedJSObject, + // maintain a map of tor settings set by Tor Browser so that we don't // repeatedly set the same key/values over and over // this map contains string keys to primitive or array values @@ -199,4 +204,9 @@ var TorProtocolService = { let torLog = this._tlps.TorGetLog(countObj); return torLog; }, + + // true if we launched and control tor, false if using system tor + get ownsTorDaemon() { + return TorLauncherUtil.shouldStartAndOwnTor; + }, };

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-disabled-color
by gk＠torproject.org 24 Oct '19

24 Oct '19

commit b2428d30e4b181b687c1509af5687097ef5b2166 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 23 14:48:27 2019 -0700 Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-disabled-color --- browser/components/securitylevel/content/securityLevelPanel.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevelPanel.css b/browser/components/securitylevel/content/securityLevelPanel.css index 170bf625ea1d..70022e2bd4b2 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.css +++ b/browser/components/securitylevel/content/securityLevelPanel.css @@ -14,7 +14,7 @@ panelview#securityLevel-panelview>vbox.panel-subview-body { label#securityLevel-header { text-transform: uppercase; - color: GrayText; + color: var(--panel-disabled-color); font-size: 0.85em; margin: 0 0 0.4em 0; padding: 0;

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-disabled-color
by gk＠torproject.org 24 Oct '19

24 Oct '19

commit a9060232a8d72487c2e823513a2d73919d164ade Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 23 14:48:27 2019 -0700 Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-disabled-color --- browser/components/securitylevel/content/securityLevelPanel.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevelPanel.css b/browser/components/securitylevel/content/securityLevelPanel.css index 170bf625ea1d..70022e2bd4b2 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.css +++ b/browser/components/securitylevel/content/securityLevelPanel.css @@ -14,7 +14,7 @@ panelview#securityLevel-panelview>vbox.panel-subview-body { label#securityLevel-header { text-transform: uppercase; - color: GrayText; + color: var(--panel-disabled-color); font-size: 0.85em; margin: 0 0 0.4em 0; padding: 0;

1 0

[tor-browser-build/master] Fold in 9.0 Changelog and typo fix
by gk＠torproject.org 24 Oct '19

24 Oct '19

commit c35b3ce6947a803bb174e0f069186ab7c9fea38a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 24 11:20:19 2019 +0000 Fold in 9.0 Changelog and typo fix --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 182 ++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 10f3682..d44272c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -30,6 +30,186 @@ Tor Browser 9.5a1 -- October 23 2019 * Android * Bug 30461: Clean up tor-android-service project +Tor Browser 9.0 -- October 22 2019 + * All Platforms + * Update Firefox to 68.2.0esr + * Bug 31740: Remove some unnecessary RemoteSettings instances + * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities + * Bug 28196: about:preferences is not properly translated anymore + * Bug 19417: Disable asmjs on safer and safest security levels + * Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING + * Bug 31935: Disable profile downgrade protection + * Bug 16285: Disable DRM/EME on Android and drop Adobe CDM + * Bug 31602: Remove Pocket indicators in UI and disable it + * Bug 31914: Fix eslint linter error + * Bug 30429: Rebase patches for Firefox 68 ESR + * Bug 31144: Review network code changes for Firefox 68 ESR + * Bug 10760: Integrate Torbutton into Tor Browser directly + * Bug 25856: Remove XUL overlays from Torbutton + * Bug 31322: Fix about:tor assertion failure debug builds + * Bug 29430: Add support for meek_lite bridges to bridgeParser + * Bug 28561: Migrate "About Tor Browser" dialog to tor-browser + * Bug 30683: Prevent detection of locale via some *.properties + * Bug 31298: Backport patch for #24056 + * Bug 9336: Odd wyswig schemes without isolation for browserspy.dk + * Bug 27601: Browser notifications are not working anymore + * Bug 30845: Make sure internal extensions are enabled + * Bug 28896: Enable extensions in private browsing by default + * Bug 31563: Reload search extensions if extensions.enabledScopes has changed + * Bug 31396: Fix communication with NoScript for security settings + * Bug 31142: Fix crash of tab and messing with about:newtab + * Bug 29049: Backport JS Poison Patch + * Bug 25214: Canvas data extraction on local 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 30681: Set security.enterprise_roots.enabled to false + * Bug 30538: Unable to comment on The Independent Newspaper + * Bug 31209: View PDF in Tor Browser is fuzzy + * Translations update + * Windows + OS X + Linux + * Update Tor to 0.4.1.6 + * Update OpenSSL to 1.1.1d + * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures + * Update Tor Launcher to 0.2.20.1 + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 32154: Custom bridge field only allows one line of input + * Bug 31286: New strings for about:preferences#tor + * Bug 31303: Do not launch tor in browser toolbox + * Bug 32112: Fix bad & escaping in translations + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 29197: Remove use of overlays + * Bug 31300: Modify Tor Launcher so it is compatible with ESR68 + * Bug 31487: Modify moat client code so it is compatible with ESR68 + * Bug 31488: Moat: support a comma-separated list of transports + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 30319: Remove FTE bits + * Translations update + * Bug 32092: Fix Tor Browser Support link in preferences + * Bug 32111: Fixed issue parsing user-provided bridge strings + * Bug 31749: Fix security level panel spawning events + * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow + * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 31059: Enable Letterboxing + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek + * Bug 31251: Security Level button UI polish + * Bug 31344: Register SecurityLevelPreference's 'unload' callback + * Bug 31286: Provide network settings on about:preferences#tor + * Bug 31886: Fix ko bundle bustage + * Bug 31768: Update onboarding for Tor Browser 9 + * Bug 27511: Add new identity button to toolbar + * Bug 31778: Support dark-theme for the Circuit Display UI + * Bug 31910: Replace meek_lite with meek in circuit display + * Bug 30504: Deal with New Identity related browser console errors + * Bug 31929: Don't escape DTD entity in ar + * Bug 31747: Some onboarding UI is always shown in English + * Bug 32041: Replace = with real hamburguer icon ≡ + * Bug 30304: Browser locale can be obtained via DTD strings + * Bug 31065: Set network.proxy.allow_hijacking_localhost to true + * Bug 24653: Merge securityLevel.properties into torbutton.dtd + * Bug 31164: Set up default bridge at Karlstad University + * Bug 15563: Disable ServiceWorkers on all platforms + * Bug 31598: Disable warning on window resize if letterboxing is enabled + * Bug 31562: Fix circuit display for error pages + * Bug 31575: Firefox is phoning home during start-up + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 26345: Hide tracking protection UI + * Bug 31601: Disable recommended extensions again + * Bug 30662: Don't show Firefox Home when opening new tabs + * Bug 31457: Disable per-installation profiles + * Bug 28822: Re-implement desktop onboarding for ESR 68 + * Windows + * Bug 31942: Re-enable signature check for language packs + * Bug 29013: Enable stack protection for Firefox on Windows + * Bug 30800: ftp:// on Windows can be used to leak the system time zone + * Bug 31547: Back out patch for Mozilla's bug 1574980 + * Bug 31141: Fix typo in font.system.whitelist + * Bug 30319: Remove FTE bits + * OS X + * Bug 30126: Make Tor Browser compatible with macOS 10.15 + * Bug 31607: App menu items stop working on macOS + * Bug 31955: On macOS avoid throwing inside nonBrowserWindowStartup() + * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: Meek and moat are broken on macOS 10.9 with Go 1.12 + * Linux + * Bug 31942: Re-enable signature check for language packs + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * Bug 31968: Don't fail if /proc/cpuinfo is not readable + * Bug 24755: Stop using a heredoc in start-tor-browser + * Bug 31550: Put curly quotes inside single quotes + * Bug 31394: Replace "-1" with "−1" in start-tor-browser.desktop + * Bug 30319: Remove FTE bits + * Android + * Update Tor to 0.4.1.5 + * Bug 31010: Rebase mobile patches for Fennec 68 + * Bug 31010: Don't use addTrustedTab() on mobile + * Bug 30607: Support Tor Browser running on Android Q + * Bug 31192: Support x86_64 target on Android + * Bug 30380: Cancel dormant by startup + * Bug 30943: Show version number on mobile + * Bug 31720: Enable website suggestions in address bar + * Bug 31822: Security slider is not really visible on Android anymore + * Bug 24920: Only create Private tabs in permanent Private Browsing Mode + * Bug 31730: Revert aarch64-workaround against JIT-related crashes + * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr + * Build System + * All Platforms + * Bug 30585: Provide standalone clang 8 project across all platforms + * Bug 30376: Use Rust 1.34 for Tor Browser 9 + * Bug 30490: Add cbindgen project for building Firefox 68 ESR/Fennec 68 + * Bug 30701: Add nodejs project for building Firefox 68 ESR/Fennec 68 + * Bug 31621: Fix node bug that makes large writes to stdout fail + * Bug 30734: Add nasm project for building Firefox 68 ESR/Fennec 68 + * Bug 31293: Make sure the lo interface inside the containers is up + * Bug 27493: Clean up mozconfig options + * Bug 31308: Sync mozconfig files used in tor-browser over to tor-browser-build for esr68 + * Windows + * Bug 29307: Use Stretch for cross-compiling for Windows + * Bug 29731: Remove faketime for Windows builds + * Bug 30322: Windows toolchain update for Firefox 68 ESR + * Bug 28716: Create mingw-w64-clang toolchain + * Bug 28238: Adapt firefox and fxc2 projects for Windows builds + * Bug 28716: Optionally omit timestamp in PE header + * Bug 31567: NS_tsnprintf() does not handle %s correctly on Windows + * Bug 31458: Revert patch for #27503 and bump mingw-w64 revision used + * Bug 9898: Provide clean fix for strcmpi issue in NSPR + * Bug 29013: Enable stack protection support for Firefox on Windows + * Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser + * Bug 31538: Windows bundles based on ESR 68 are not built reproducibly + * Bug 31584: Clean up mingw-w64 project + * Bug 31596: Bump mingw-w64 version to pick up fix for #31567 + * Bug 29187: Bump NSIS version to 3.04 + * Bug 31732: Windows nightly builds are busted due to mingw-w64 commit bump + * Bug 29319: Remove FTE support for Windows + * OS X + * Bug 30323: MacOS toolchain update for Firefox 68 ESR + * Bug 31467: Switch to clang for cctools project + * Bug 31465: Adapt tor-browser-build projects for macOS notarization + * Linux + * Bug 31448: gold and lld break linking 32bit Linux bundles + * Bug 31618: Linux32 builds of Tor Browser 9.0a6 are not matching + * Bug 31450: Still use GCC for our ASan builds + * Bug 30321: Linux toolchain update for Firefox ESR 68 + * Bug 30736: Install yasm from wheezy-backports + * Bug 31447: Don't install Python just for Mach + * Bug 30448: Strip Browser/gtk2/libmozgtk.so + * Android + * Bug 30324: Android toolchain update for Fennec 68 + * Bug 31173: Update android-toolchain project to match Firefox + * Bug 31389: Update Android Firefox to build with Clang + * Bug 31388: Update Rust project for Android + * Bug 30665: Get Firefox 68 ESR working with latest android toolchain + * Bug 30460: Update TOPL project to use Firefox 68 toolchain + * Bug 30461: Update tor-android-service project to use Firefox 68 toolchain + * Bug 28753: Use Gradle with --offline when building the browser part + * Bug 31564: Make Android bundles based on ESR 68 reproducible + * Bug 31981: Remove require-api.patch + * Bug 31979: TOPL: Sort dependency list + * Bug 30665: Remove unnecessary build patches for Firefox + Tor Browser 9.0a8 -- October 14 2019 * All Platforms * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities @@ -167,7 +347,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 31396: Fix communication with NoScript for security settings * Bug 31142: Fix crash of tab and messing with about:newtab * Bug 29049: Backport JS Poison Patch - * Bug 25214: Canvas data extraction on locale pdf file should be allowed + * Bug 25214: Canvas data extraction on local 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

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit 94f2e5e7e73c3b5b52055eadd0e2dcc864d598c4 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Oct 22 15:00:02 2019 -0700 Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index c7bd6f4236ae..0b682ceeeb83 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -211,7 +211,7 @@ var TorStrings = { "torPreferences.advancedDescription", "Configure how Tor Browser connects to the internet." ), - useLocalProxy: getString("torPreferences.useProxy", "Use a local proxy"), + useLocalProxy: getString("torsettings.useProxy.checkbox", "I use a proxy to connect to the Internet"), proxyType: getString("torsettings.useProxy.type", "Proxy Type"), proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"),

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit cbf86255ae7cfe82b555931d9db3b9e528036c65 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Oct 22 15:00:02 2019 -0700 Bug 32188: Change useLocalProxy string to tor-launcher's torsettings.useProxy.checkbox in TorStrings.jsm --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index c7bd6f4236ae..0b682ceeeb83 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -211,7 +211,7 @@ var TorStrings = { "torPreferences.advancedDescription", "Configure how Tor Browser connects to the internet." ), - useLocalProxy: getString("torPreferences.useProxy", "Use a local proxy"), + useLocalProxy: getString("torsettings.useProxy.checkbox", "I use a proxy to connect to the Internet"), proxyType: getString("torsettings.useProxy.type", "Proxy Type"), proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"),

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] fixup! Bug 28885: notify users that update is downloading
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit 03e81dff562d9eda9c056066a50089fdee325dd9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 22 14:45:04 2019 -0400 fixup! Bug 28885: notify users that update is downloading --- browser/themes/shared/customizableui/panelUI.inc.css | 2 ++ browser/themes/shared/notification-icons.inc.css | 1 + 2 files changed, 3 insertions(+) diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 977e27cf7c98..7ac4b76f663a 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -81,6 +81,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; @@ -91,6 +92,7 @@ } .panel-banner-item[notificationid="update-available"]::after, +.panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, .panel-banner-item[notificationid="update-restart"]::after { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index cf857d9de815..6d461a89488c 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -379,6 +379,7 @@ html|*#webRTC-previewVideo { /* UPDATE */ .popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], .popup-notification-icon[popupid="update-restart"] { background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center;

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 28885: notify users that update is downloading
by gk＠torproject.org 23 Oct '19

23 Oct '19

commit c5ef11aaa653334882a48a79c403c063500a129a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 22 14:45:04 2019 -0400 fixup! Bug 28885: notify users that update is downloading --- browser/themes/shared/customizableui/panelUI.inc.css | 2 ++ browser/themes/shared/notification-icons.inc.css | 1 + 2 files changed, 3 insertions(+) diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 977e27cf7c98..7ac4b76f663a 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -81,6 +81,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; @@ -91,6 +92,7 @@ } .panel-banner-item[notificationid="update-available"]::after, +.panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, .panel-banner-item[notificationid="update-restart"]::after { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index cf857d9de815..6d461a89488c 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -379,6 +379,7 @@ html|*#webRTC-previewVideo { /* UPDATE */ .popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], .popup-notification-icon[popupid="update-restart"] { background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center;

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit d9bdd00cdd884f0c854affe0d0f13ce709ee75fb Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Oct 21 02:22:34 2019 +0000 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 32169: Fix TB9 Wikipedia address bar search Bugfix on d093f0baea0b2b536b791d6613c384a7a4b1fe24, which accidentally renamed search_url_get_params to suggest_url_get_params. Apparently, until recently Firefox used to prefer search_form (which hardcodes the parameters for Wikipedia) to search_url (which does not), so this was hidden. --- browser/components/search/extensions/wikipedia/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json index 25bfbcce3b58..1bdf45ee3acb 100644 --- a/browser/components/search/extensions/wikipedia/manifest.json +++ b/browser/components/search/extensions/wikipedia/manifest.json @@ -21,7 +21,7 @@ "search_url": "https://en.wikipedia.org/wiki/Special:Search", "search_form": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=…", "suggest_url": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}", - "suggest_url_get_params": "search={searchTerms}&sourceid=Mozilla-search" + "search_url_get_params": "search={searchTerms}&sourceid=Mozilla-search" } } }

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit 9c6f36175099ac18740064b39aca1a3eb596741a Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Oct 21 02:22:34 2019 +0000 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 32169: Fix TB9 Wikipedia address bar search Bugfix on d093f0baea0b2b536b791d6613c384a7a4b1fe24, which accidentally renamed search_url_get_params to suggest_url_get_params. Apparently, until recently Firefox used to prefer search_form (which hardcodes the parameters for Wikipedia) to search_url (which does not), so this was hidden. --- browser/components/search/extensions/wikipedia/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json index 25bfbcce3b58..1bdf45ee3acb 100644 --- a/browser/components/search/extensions/wikipedia/manifest.json +++ b/browser/components/search/extensions/wikipedia/manifest.json @@ -21,7 +21,7 @@ "search_url": "https://en.wikipedia.org/wiki/Special:Search", "search_form": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=…", "suggest_url": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}", - "suggest_url_get_params": "search={searchTerms}&sourceid=Mozilla-search" + "search_url_get_params": "search={searchTerms}&sourceid=Mozilla-search" } } }

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 31764: Fix for error when navigating via 'Paste and go'
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit 4c0b11d76d773c471f7d4884e7d0764f6ef00c7b Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 21 17:02:31 2019 -0700 Bug 31764: Fix for error when navigating via 'Paste and go' The onURLBarUserStartNavigation callback expects an object from the UrlBarInput with information about how a URL was navigated to. This specifically helps to deal with the various buttons and links in the UrlBar dropdown (search engines, bookmarks, suggestions, etc). However, when using 'Paste and go' this data is not present nor relevant and an empty object {} is provided instead. This also happens if the user types the 'verbose url' (for example: https://www.example.com rather than www.example.com) navigates away from the urlbar thus dismissing the dropdown, then navigating back to the urlbar and hitting enter. Pasting the less 'verbose url' causes the code to go down another path which attempts to resolve the actual url before attempting to call _loadURL with a null result object, rather than an empty {} result object. In this scenario no exception is thrown. This patch explicitly passes null rather than implicitly passing {} to _loadURL when a resolved 'verbose' url is entered into the UrlBar via 'Paste and go' (as well as the previously described type -> dismiss popup -> enter flow). --- browser/components/urlbar/UrlbarInput.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index f33b9b6a6d24..fe4a21832d54 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -443,7 +443,7 @@ class UrlbarInput { return; } - this._loadURL(url, where, openParams); + this._loadURL(url, where, openParams, null); } handleRevert() {

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 31764: Fix for error when navigating via 'Paste and go'
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit 228fdd9e73df5a4286557134bebc2a189976fb99 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 21 17:02:31 2019 -0700 Bug 31764: Fix for error when navigating via 'Paste and go' The onURLBarUserStartNavigation callback expects an object from the UrlBarInput with information about how a URL was navigated to. This specifically helps to deal with the various buttons and links in the UrlBar dropdown (search engines, bookmarks, suggestions, etc). However, when using 'Paste and go' this data is not present nor relevant and an empty object {} is provided instead. This also happens if the user types the 'verbose url' (for example: https://www.example.com rather than www.example.com) navigates away from the urlbar thus dismissing the dropdown, then navigating back to the urlbar and hitting enter. Pasting the less 'verbose url' causes the code to go down another path which attempts to resolve the actual url before attempting to call _loadURL with a null result object, rather than an empty {} result object. In this scenario no exception is thrown. This patch explicitly passes null rather than implicitly passing {} to _loadURL when a resolved 'verbose' url is entered into the UrlBar via 'Paste and go' (as well as the previously described type -> dismiss popup -> enter flow). --- browser/components/urlbar/UrlbarInput.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index f33b9b6a6d24..fe4a21832d54 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -443,7 +443,7 @@ class UrlbarInput { return; } - this._loadURL(url, where, openParams); + this._loadURL(url, where, openParams, null); } handleRevert() {

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 31803: Replaced about:debugging logo with flat version
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit f049d363fcfc7ce38963308a99ede18879c963d5 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 21 14:23:59 2019 -0700 Bug 31803: Replaced about:debugging logo with flat version --- .../themes/images/aboutdebugging-firefox-logo.svg | 34 +++------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg index 9240dc6e84ca..d7895f1107c5 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg @@ -1,31 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs> - <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> - <stop stop-color="#420C5D" offset="0%"></stop> - <stop stop-color="#951AD1" offset="100%"></stop> - </linearGradient> - <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> - <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> - <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> - <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> - <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> - </filter> - </defs> - <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="icon_512x512"> - <g id="Group"> - <g id="tb_icon/Stable"> - <g id="Stable"> - <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> - <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> - <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> - <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> - <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> - </g> - </g> - </g> - </g> - </g> - </g> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <g fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="nonzero"> + <path d="M12.0246161,21.8174863 L12.0246161,20.3628098 C16.6324777,20.3495038 20.3634751,16.6108555 20.3634751,11.9996673 C20.3634751,7.38881189 16.6324777,3.65016355 12.0246161,3.63685757 L12.0246161,2.18218107 C17.4358264,2.1958197 21.8178189,6.58546322 21.8178189,11.9996673 C21.8178189,17.4142042 17.4358264,21.8041803 12.0246161,21.8174863 L12.0246161,21.8174863 Z M12.0246161,16.7259522 C14.623607,16.7123136 16.7272828,14.6023175 16.7272828,11.9996673 C16.7272828,9.39734991 14.623607,7.28735377 12.0246161,7.27371516 L12.0246161,5.81937131 C15.4272884,5.8326773 18.1819593,8.59400123 18.1819593,11.9996673 C18.1819593,15.4056661 15.4272884,18.1669901 12.0246161,18.1802961 L12.0246161,16.7259522 Z M12.0246161,9.45556355 C13.4187503,9.46886953 14.5454344,10.6022066 14.5454344,11.9996673 C14.5454344,13.3974608 13.4187503,14.5307978 12.0246161,14.5441038 L12.0246161,9.45556355 Z M0,11.9996673 C0,18.6273771 5.37229031,24 12,24 C18.6273771,24 24,18.6273771 24,11.9996673 C24,5.37229031 18.6273771,0 12,0 C5.37229031,0 0,5.37229031 0,11.9996673 Z"/> + </g> </svg> \ No newline at end of file

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 31803: Replaced about:debugging logo with flat version
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit 53298d61abe83f983730157c547b9993ebd6bdf3 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 21 14:23:59 2019 -0700 Bug 31803: Replaced about:debugging logo with flat version --- .../themes/images/aboutdebugging-firefox-logo.svg | 34 +++------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg index 9240dc6e84ca..d7895f1107c5 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg @@ -1,31 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs> - <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> - <stop stop-color="#420C5D" offset="0%"></stop> - <stop stop-color="#951AD1" offset="100%"></stop> - </linearGradient> - <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> - <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> - <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> - <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> - <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> - </filter> - </defs> - <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="icon_512x512"> - <g id="Group"> - <g id="tb_icon/Stable"> - <g id="Stable"> - <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> - <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> - <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> - <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> - <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> - </g> - </g> - </g> - </g> - </g> - </g> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <g fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="nonzero"> + <path d="M12.0246161,21.8174863 L12.0246161,20.3628098 C16.6324777,20.3495038 20.3634751,16.6108555 20.3634751,11.9996673 C20.3634751,7.38881189 16.6324777,3.65016355 12.0246161,3.63685757 L12.0246161,2.18218107 C17.4358264,2.1958197 21.8178189,6.58546322 21.8178189,11.9996673 C21.8178189,17.4142042 17.4358264,21.8041803 12.0246161,21.8174863 L12.0246161,21.8174863 Z M12.0246161,16.7259522 C14.623607,16.7123136 16.7272828,14.6023175 16.7272828,11.9996673 C16.7272828,9.39734991 14.623607,7.28735377 12.0246161,7.27371516 L12.0246161,5.81937131 C15.4272884,5.8326773 18.1819593,8.59400123 18.1819593,11.9996673 C18.1819593,15.4056661 15.4272884,18.1669901 12.0246161,18.1802961 L12.0246161,16.7259522 Z M12.0246161,9.45556355 C13.4187503,9.46886953 14.5454344,10.6022066 14.5454344,11.9996673 C14.5454344,13.3974608 13.4187503,14.5307978 12.0246161,14.5441038 L12.0246161,9.45556355 Z M0,11.9996673 C0,18.6273771 5.37229031,24 12,24 C18.6273771,24 24,18.6273771 24,11.9996673 C24,5.37229031 18.6273771,0 12,0 C5.37229031,0 0,5.37229031 0,11.9996673 Z"/> + </g> </svg> \ No newline at end of file

1 0

[tor-launcher/master] Bug 32164: Now trimming each received log line from tor
by gk＠torproject.org 22 Oct '19

22 Oct '19

commit dd8147ceed102f93f246e67c91dcc36139451c8b Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 21 14:47:40 2019 -0700 Bug 32164: Now trimming each received log line from tor --- src/components/tl-protocol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index a5fd1d9..d6df319 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1487,7 +1487,7 @@ TorProtocolService.prototype = if ((idx > 0)) { let eventType = s.substring(0, idx); - let msg = s.substr(idx + 1); + let msg = s.substr(idx + 1).trim(); switch (eventType) { case "WARN":

1 0

[tor-browser-spec/master] Merge branch 'bug_32147'
by gk＠torproject.org 21 Oct '19

21 Oct '19

commit b11c935c4ef26a0a1317a2213b42e38186ba4970 Merge: d25eeb6 f8ce4db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 21 12:49:17 2019 +0000 Merge branch 'bug_32147' processes/ReleaseProcess | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[tor-browser-spec/master] Bug 32147: Update release instructions with Torbutton changes for 9.0
by gk＠torproject.org 21 Oct '19

21 Oct '19

commit f8ce4dbe63724b0af30ec2132174f19908d843f3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 21 12:47:15 2019 +0000 Bug 32147: Update release instructions with Torbutton changes for 9.0 --- processes/ReleaseProcess | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 2b772e5..f6256db 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -4,6 +4,10 @@ # #. Tag any relevant component versions. +# In particular: before tagging the tor-browser tag, the final code from +# Torbutton needs to get included and in order to avoid unnecessary commit +# inflation the commit for bumping the git submodule should be a fixup commit +# to the one with "Pick up latest Torbutton code" in its commit message. #. Update changelog and relevant config files in tor-browser-build. cd tor-browser-build @@ -45,6 +49,8 @@ # For stable releases put tails-dev(a)boum.org into Cc. #. Codesign the macOS dmg files. + # XXX: Update with Notarization bits once they are included in our signing + # setup torsocks ssh mac-signer "mkdir $TORBROWSER_VERSION" torsocks rsync -avP $TORBROWSER_BUILDDIR/*.dmg mac-signer:$TORBROWSER_VERSION/ torsocks ssh mac-signer

1 0

[tor-browser-build/master] Pick up tor-browser build2
by gk＠torproject.org 20 Oct '19

20 Oct '19

commit 599384e472b551f91bb38e3956dc8858fa2d43f4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 20 08:23:37 2019 +0000 Pick up tor-browser build2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c30a71f..de83467 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' 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 4d52fd2..10f3682 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,6 @@ Tor Browser 9.5a1 -- October 23 2019 * Bug 30681: Set security.enterprise_roots.enabled to false * Bug 31144: Review network code changes for Firefox 68 ESR * Bug 21549: Enable WASM on standard security level - * Bug 28709: Enable FuzzyFox * Windows + OS X + Linux * Update Tor Launcher to 0.2.20.1 * Bug 32154: Custom bridge field only allows one line of input diff --git a/rbm.conf b/rbm.conf index 45a5c64..6fe1010 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0a8 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Revert "squash! TB4: Tor Browser's Firefox preference overrides."
by gk＠torproject.org 20 Oct '19

20 Oct '19

commit e14b7b74e92cba5cff63b6cd73bac67841907f0d Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 20 08:13:10 2019 +0000 Revert "squash! TB4: Tor Browser's Firefox preference overrides." This reverts commit 81d2d351b4c93e139f13a6f21a9abadedc86ee6c. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 96d14314eb24..3d0de789205b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -169,8 +169,6 @@ pref("browser.cache.frecency_experiment", -1); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); -// Enable FuzzyFox -pref("privacy.fuzzyfox.enabled", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser-build/master] Release preparations for 9.5a1
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit c6b664f549650a07d63c7fc8695bbdc03c515f27 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:14:37 2019 +0000 Release preparations for 9.5a1 Changelog update and versions bump --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 33 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 ++-- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index fe1b5d4..c30a71f 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-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' 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 2930090..4d52fd2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 9.5a1 -- October 23 2019 + * All Platforms + * Update Firefox to 68.2.0esr + * Bug 31740: Remove some unnecessary RemoteSettings instances + * Bug 30681: Set security.enterprise_roots.enabled to false + * Bug 31144: Review network code changes for Firefox 68 ESR + * Bug 21549: Enable WASM on standard security level + * Bug 28709: Enable FuzzyFox + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.20.1 + * Bug 32154: Custom bridge field only allows one line of input + * Bug 32112: Fix bad & escaping in translations + * Bug 31286: Update to tor settings related strings + * Translations update + * Bug 32125: Fix circuit display for bridge without a fingerprint + * Bug 32076: Upgrade to goptlib v1.1.0 + * Bug 32061: Bump snowflake version to b4f4b29a03 + * Bug 32092: Fix Tor Browser Support link in preferences + * Bug 32111: Fixed issue parsing user-provided bridge strings + * Bug 31749: Fix security level panel spawning events + * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow + * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel + * Translations update + * Android + * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr + * Bug 26529: Notify user about possible proxy-bypass before opening external app + * Build System + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + * Bug 31989: Backport backout of old mingw-gcc patch + * Android + * Bug 30461: Clean up tor-android-service project + Tor Browser 9.0a8 -- October 14 2019 * All Platforms * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3171be7..c4010e7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.19.5 +version: 0.2.20.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 3ba38e4..45a5c64 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a8' - torbrowser_build: 'build2' + torbrowser_version: '9.5a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0a7 + - 9.0a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 840c3930d54b38f52a990a8514a4a2deaffb3247 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:08:26 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 9d744c6adc5e..05744bc48afd 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 9d744c6adc5ee3608e519c5db49528cd6ee6fe54 +Subproject commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61

1 0

[torbutton/master] Translations update
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:05:40 2019 +0000 Translations update --- chrome/locale/da/browserOnboarding.properties | 8 ++++---- chrome/locale/ja/browserOnboarding.properties | 10 +++++----- chrome/locale/ka/browserOnboarding.properties | 12 ++++++------ chrome/locale/mk/aboutTBUpdate.dtd | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/chrome/locale/da/browserOnboarding.properties b/chrome/locale/da/browserOnboarding.properties index 0b6f4ddc..a1113637 100644 --- a/chrome/locale/da/browserOnboarding.properties +++ b/chrome/locale/da/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillinger som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu findes i Præferencer. onboarding.tour-tor-network.action-button=Juster dine Tor-netværksindstillinger onboarding.tour-tor-network.button=Gå til kredsløb-visning @@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Opdateret onboarding.tour-tor-toolbar=Værktøjslinje onboarding.tour-tor-toolbar-update-9.0.title=Farvel Onion-knap. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=Forespørg en ny identitet +onboarding.tour-tor-toolbar-update-9.0.description=Vil ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge onion-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmod om en ny identitet med værktøjslinjeknappen eller [≡]-menuen. +onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-netværk # Circuit Display onboarding. diff --git a/chrome/locale/ja/browserOnboarding.properties b/chrome/locale/ja/browserOnboarding.properties index 1a3b8846..598b5960 100644 --- a/chrome/locale/ja/browserOnboarding.properties +++ b/chrome/locale/ja/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Tor ネットワークへ onboarding.tour-tor-network=Tor ネットワーク onboarding.tour-tor-network.title=分散型ネットワークを旅する。 onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。 -onboarding.tour-tor-network.description-para2=新規：Torネットワーク設定。環境設定に追加され、Torが検問されている地域でブリッジをリクエストすることができます。 -onboarding.tour-tor-network.action-button=Torネットワーク設定を設定する +onboarding.tour-tor-network.description-para2=NEW: Tor ネットワークの設定は、[設定] メニューの中に移動しました。Tor がブロックされる地域でブリッジを要求することなどができます。 +onboarding.tour-tor-network.action-button=Tor ネットワークの設定を調整 onboarding.tour-tor-network.button=サーキットディスプレイへ onboarding.tour-tor-circuit-display=サーキットディスプレイ @@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=新機能 onboarding.tour-tor-update.prefix-updated=更新 onboarding.tour-tor-toolbar=ツールバー -onboarding.tour-tor-toolbar-update-9.0.title= グッバイ、Onion Button。 -onboarding.tour-tor-toolbar-update-9.0.description=あなたのTorのすべてのデータをTor Browserに完全に移行したいと考えています。 -onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、今では、Onion buttonを使用せずに、URLバーの[ i ]をクリックしてTorサーキットを表示し、「このサイトに新しいサーキットを使用」をクリックするか、または[≡]メニューの「新しい識別子」をクリックして新しい識別子を要求することができます。 +onboarding.tour-tor-toolbar-update-9.0.title=さようなら、玉ねぎボタン。 +onboarding.tour-tor-toolbar-update-9.0.description=私たちは Tor の使用感を完全に Tor Browser に調和させたいと思っています。 +onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、玉ねぎボタンの代わりに、URL バーの [i] ボタンから Tor サーキットを確認したり、ツールバーボタンや [≡] メニューから新しい識別子をリクエストしたりできるようにしました。 onboarding.tour-tor-toolbar-update-9.0.button=新しい識別子をリクエストする方法 onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ネットワークへ diff --git a/chrome/locale/ka/browserOnboarding.properties b/chrome/locale/ka/browserOnboarding.properties index 11832796..5de57a60 100644 --- a/chrome/locale/ka/browserOnboarding.properties +++ b/chrome/locale/ka/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=იხილეთ Tor-ქსელი onboarding.tour-tor-network=Tor-ქსელი onboarding.tour-tor-network.title=ისარგებლეთ დამოუკიდებელი, ერთპიროვნული მმართველობისგან დაცული ქსელით. onboarding.tour-tor-network.description=Tor-ბრაუზერით უკავშირდებით Tor-ქსელს, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე, მთელი მსოფლიოს მასშტაბით. განსხვავებით VPN-ისგან, ამ შემთხვევაში არ გიწევთ ცალკეული პირის ან ერთეულის ნდობა და არავისზე ხართ დამოკიდებული, ინტერნეტით ვინაობის გაუმჟღავნებლად სარგებლობისას. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=სიახლე: Tor-ქსელის გამართვა, აგრეთვე, ხიდების მოთხოვნა, Tor-ის შეზღუდვის პირობებში, ახლა უკვე შეგიძლიათ პარამეტრებიდან. +onboarding.tour-tor-network.action-button=გამართეთ Tor-ქსელის პარამეტრები onboarding.tour-tor-network.button=იხილეთ წრედის არე onboarding.tour-tor-circuit-display=წრედის არე @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=ახალი onboarding.tour-tor-update.prefix-updated=განახლებული onboarding.tour-tor-toolbar=ხელსაწყოთა ზოლი -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=მშვიდობით Onion Button. +onboarding.tour-tor-toolbar-update-9.0.description=გვსურს, რომ Tor სრულად იყოს ჩაშენებული Tor-ბრაუზერში. +onboarding.tour-tor-toolbar-update-9.0.description-para2=სწორედ ამიტომ, ამიერიდან Tor-წრედს იხილავთ onion-ღილაკის ნაცვლად, [i] ნიშანზე დაწკაპებისას მისამართების ველში, ხოლო ახალი ვინაობის მოთხოვნა შეგეძლებათ ხელსაწყოთა ზოლიდან ან [≡] მენიუდან. +onboarding.tour-tor-toolbar-update-9.0.button=როგორ ხდება ახალი ვინაობის მოთხოვნა onboarding.tour-tor-toolbar-update-9.0.next-button=იხილეთ Tor-ქსელი # Circuit Display onboarding. diff --git a/chrome/locale/mk/aboutTBUpdate.dtd b/chrome/locale/mk/aboutTBUpdate.dtd index 9d8c386a..1649a138 100644 --- a/chrome/locale/mk/aboutTBUpdate.dtd +++ b/chrome/locale/mk/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени"> <!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран."> -<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,"> -<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна"> +<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, "> +<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Верзија"> <!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">

1 0

[torbutton/master] Bug 32125: Fix circuit display for bridge without a fingerprint
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 73df82bd36a812496067c8bef948df5130cb991b Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Oct 17 14:40:40 2019 -0700 Bug 32125: Fix circuit display for bridge without a fingerprint Torbutton expects all bridges to have a fingerprint when creating the browser's circuit display. This patch works around the case when the user provides a bridge without a fingerprint by assuming it is a bridge, but we cannot determine the other displayed info: type (obfs4, meek, etc) nor the ip. In this scenario, the entry node in the circuit display will simply say "Bridge". --- chrome/content/tor-circuit-display.js | 24 ++++++++++++++++-------- modules/tor-control-port.js | 3 +++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index f75bd781..21bcc57b 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -84,12 +84,19 @@ let nodeDataForID = async function (controller, id) { result.ip = bridge.address.split(":")[0]; } catch (e) { } } else { - result.type = "default"; - // Get the IP address for the given node ID. - try { - let statusMap = await controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; - } catch (e) { } + // either dealing with a relay, or a bridge whose fingerprint is not saved in torrc + try { + let statusMap = await controller.getInfo("ns/id/" + id); + result.type = "default"; + result.ip = statusMap.IP; + } catch (e) { + // getInfo will throw if the given id is not a relay + // this probably means we are dealing with a user-provided bridge with no fingerprint + result.type = "bridge"; + // we don't know the ip or type, so leave blank + result.ip = ""; + result.bridgeType = ""; + } } if (result.ip) { // Get the country code for the node's IP address. @@ -294,10 +301,11 @@ let updateCircuitDisplay = function () { let bridgeType = nodeData[i].bridgeType; if (bridgeType === "meek_lite") { relayText += ": meek"; - } else if (bridgeType !== "vanilla") { + } + else if (bridgeType !== "vanilla" && bridgeType !== "") { relayText += ": " + bridgeType; } - } else { + } else if (nodeData[i].type == "default") { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 6e310b52..9f6dbeb6 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -459,6 +459,9 @@ info.streamStatusParser = function (text) { "CircuitID", "Target"]); }; + +// TODO: fix this parsing logic to handle bridgeLine correctly +// fingerprint/id is an optional parameter // __info.bridgeParser(bridgeLine)__. // Takes a single line from a `getconf bridge` result and returns // a map containing the bridge's type, address, and ID.

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 26529 - Prompt before opening external app
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 6dc05e67cdbbb0a74f2c24387a3ea7443e08b57c Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sat Oct 12 00:45:36 2019 +0000 Bug 26529 - Prompt before opening external app --- .../base/java/org/mozilla/gecko/BrowserApp.java | 7 +++++-- .../android/base/java/org/mozilla/gecko/GeckoApp.java | 7 +++++-- .../base/java/org/mozilla/gecko/GeckoApplication.java | 7 +++++-- .../base/java/org/mozilla/gecko/IntentHelper.java | 15 +++++++++++---- .../java/org/mozilla/gecko/toolbar/BrowserToolbar.java | 1 + .../org/mozilla/gecko/toolbar/ToolbarEditLayout.java | 18 ++++++++++++++---- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5d6f725dc1c5..ab19b78d54e7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -175,6 +175,7 @@ import org.mozilla.gecko.util.WindowUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; import org.mozilla.gecko.widget.AnimatedProgressBar; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.DynamicToolbarAnimator; @@ -2237,7 +2238,8 @@ public class BrowserApp extends GeckoApp if (AppConstants.RELEASE_OR_BETA) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse("market://details?id=" + getPackageName())); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); break; } @@ -4195,7 +4197,8 @@ public class BrowserApp extends GeckoApp if (flags.contains(OnUrlOpenListener.Flags.OPEN_WITH_INTENT)) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(url)); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); } else { // By default this listener is used for lists where the offline reader-view icon // is shown - hence we need to redirect to the reader-view page by default. diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 1504470b697e..42edb2bfc99b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -43,6 +43,7 @@ import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.ViewUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoSessionSettings; import org.mozilla.geckoview.GeckoView; @@ -766,11 +767,13 @@ public abstract class GeckoApp extends GeckoActivity if (email != null) { Uri contactUri = Uri.parse(email); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else if (phone != null) { Uri contactUri = Uri.parse(phone); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else { // something went wrong. Log.e(LOGTAG, "Received Contact:Add message with no email nor phone number"); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index bb3cdec7c0fe..3801bb4d0b64 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -25,6 +25,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; import android.support.multidex.MultiDex; +import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.util.Base64; import android.util.Log; @@ -64,6 +65,7 @@ import org.mozilla.gecko.util.PRNGFixes; import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ShortcutUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoRuntime; import org.mozilla.geckoview.GeckoRuntimeSettings; @@ -813,8 +815,9 @@ public class GeckoApplication extends Application context.getContentResolver().delete(intent.getData(), null, null); } }; - ActivityHandlerHelper.startIntentForActivity(currentActivity, chooser, - handler); + ActivityHandlerHelper.registerActivityHandler(handler); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + currentActivity, ((AppCompatActivity)currentActivity).getSupportFragmentManager(), intent); } }); } diff --git a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java index c5b1666a31da..b5853a35ae20 100644 --- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java @@ -123,7 +123,7 @@ public final class IntentHelper implements BundleEventListener { String className, String action, String title, - final boolean showPromptInPrivateBrowsing) { + boolean showPromptInPrivateBrowsing) { final Context context = getContext(); final Intent intent = getOpenURIIntent(context, targetURI, mimeType, action, title); @@ -141,10 +141,15 @@ public final class IntentHelper implements BundleEventListener { } } + // Always prompt for Intents + showPromptInPrivateBrowsing = true; + final FragmentActivity activity = getActivity(); if (!showPromptInPrivateBrowsing || activity == null) { if (activity == null) { - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // We'll find out what this breaks. + return false; } return ActivityHandlerHelper.startIntentAndCatch(LOGTAG, context, intent); } else { @@ -152,7 +157,7 @@ public final class IntentHelper implements BundleEventListener { // statically, but since this method is called from Gecko and I'm // unfamiliar with that code, this is a simpler solution. return ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( - context, activity.getSupportFragmentManager(), intent); + activity, activity.getSupportFragmentManager(), intent); } } @@ -472,7 +477,9 @@ public final class IntentHelper implements BundleEventListener { // isn't owned exclusively by Firefox, so there's no real benefit to using content:// URIs // here. try (StrictModeContext unused = StrictModeContext.allowAllVmPolicies()) { - ActivityHandlerHelper.startIntentForActivity(activity, intent, handler); + // Always prompt. + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + activity, activity.getSupportFragmentManager(), intent); } catch (SecurityException e) { Log.w(LOGTAG, "Forbidden to launch activity.", e); } diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java index 2bc379cecb8b..3ba208ea0fcc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java @@ -222,6 +222,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout prefs = new ToolbarPrefs(); urlDisplayLayout.setToolbarPrefs(prefs); urlEditLayout.setToolbarPrefs(prefs); + urlEditLayout.setActivity(activity); // ScrollViews are allowed to have only one child. final View scrollChild = urlDisplayScroll.getChildAt(0); diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java index a28847285350..ecd8d49f5a41 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java @@ -9,6 +9,7 @@ import android.app.Activity; import android.content.Intent; import android.graphics.drawable.Drawable; import android.speech.RecognizerIntent; +import android.support.v7.app.AppCompatActivity; import android.widget.Button; import org.mozilla.gecko.ActivityHandlerHelper; import org.mozilla.gecko.GeckoAppShell; @@ -30,6 +31,7 @@ import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.InputOptionsUtils; import org.mozilla.gecko.util.StringUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.themed.ThemedImageButton; import org.mozilla.gecko.widget.themed.ThemedLinearLayout; @@ -60,6 +62,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { private final ThemedImageButton mVoiceInput; private final ThemedImageButton mQrCode; + private Activity mActivity; + private OnFocusChangeListener mFocusChangeListener; private boolean showKeyboardOnFocus = false; // Indicates if we need to show the keyboard after the app resumes @@ -185,6 +189,10 @@ public class ToolbarEditLayout extends ThemedLinearLayout { mQrCode.setPrivateMode(isPrivate); } + public void setActivity(Activity activity) { + mActivity = activity; + } + /** * Called when the parent gains focus (on app launch and resume) */ @@ -294,8 +302,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "voice_input_launch"); final Intent intent = InputOptionsUtils.createVoiceRecognizerIntent(getResources().getString(R.string.voicesearch_prompt)); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent data) { if (resultCode != Activity.RESULT_OK) { @@ -316,6 +323,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { imm.showSoftInput(mEditText, InputMethodManager.SHOW_IMPLICIT); } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } private boolean qrCodeIsEnabled(Context context) { @@ -331,8 +340,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "qrcode_input_launch"); final Intent intent = InputOptionsUtils.createQRCodeReaderIntent(); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent intent) { if (resultCode == Activity.RESULT_OK) { @@ -353,5 +361,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { // as well as the actual result, which may hold a URL. } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } }

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit f6b7218543a748a5f49c67dc397bb6348756a7a3 Author: Tom Ritter <tom(a)mozilla.com> Date: Thu Oct 3 21:02:16 2019 +0000 Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman Bug 1460357 disabled AVX because gcc was generating unaligned instructions. But clang doesn't seem to do that. Differential Revision: https://phabricator.services.mozilla.com/D48072 --HG-- extra : moz-landing-system : lando --- gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp index b04eaa91f8dc..d87ad1eb0503 100644 --- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp +++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp @@ -7,7 +7,7 @@ // As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce // unaligned instructions for this code, resulting in a crash. -#if defined(__AVX2__) && !defined(__MINGW32__) +#if defined(__AVX2__) #include <immintrin.h> #include <stdint.h>

1 0