- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 27903: Isolate Tor Browser from dconf-service
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 4e682a909ec2af4c0452934446392f7ff918d8d1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Jan 30 13:52:50 2020 +0100 Bug 27903: Isolate Tor Browser from dconf-service --- projects/tor-browser/RelativeLink/start-tor-browser | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 9356d4c..624bb3c 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -346,6 +346,9 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" export FONTCONFIG_FILE="fonts.conf" +# Avoid overwriting user's dconf values. Fixes #27903. +export GSETTINGS_BACKEND=memory + cd "${HOME}" # We pass all additional command-line arguments we get to Firefox.

1 0

[tor-browser-build/maint-9.0] Bug 32891: Add new IPv4/IPv6 default bridge.
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 82672d50af26c862214f3c1c2670897f94a9dbf9 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:46:19 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index da3f2cd..a87aa58 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Merge remote-tracking branch 'phw/task/32891'
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 215aed39ee177bd0a371e8e4b6d7de3fcf69ffed Merge: e1127b3 21faabf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 13:31:34 2020 +0100 Merge remote-tracking branch 'phw/task/32891' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser-build/master] Bug 32891: Add new IPv4/IPv6 default bridge.
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 21faabfdbf08dbf25ff1fcf77c54d684b15c6fa1 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:46:19 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index da3f2cd..a87aa58 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 1590538 - Don't pass an empty object to urlbar-user-start-navigation because it doesn't handle it properly. r=Standard8
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit d361b0b2c8e51cec5088233006be152c340b6553 Author: Marco Bonardo <mbonardo(a)mozilla.com> Date: Wed Oct 30 14:25:02 2019 +0000 Bug 1590538 - Don't pass an empty object to urlbar-user-start-navigation because it doesn't handle it properly. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D50634 --HG-- extra : moz-landing-system : lando --- browser/components/urlbar/UrlbarInput.jsm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index cb0ab15d7ebf..21a7a5d9910f 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -1217,9 +1217,9 @@ class UrlbarInput { * @param {nsIInputStream} [params.postData] * The POST data associated with a search submission. * @param {boolean} [params.allowInheritPrincipal] - * If the principal may be inherited - * @param {object} [result] - * Details of the selected result, if any + * Whether the principal can be inherited. + * @param {object} [resultDetails] + * Details of the selected result, if any. * @param {UrlbarUtils.RESULT_TYPE} [result.type] * Details of the result type, if any. * @param {UrlbarUtils.RESULT_SOURCE} [result.source] @@ -1230,7 +1230,7 @@ class UrlbarInput { url, openUILinkWhere, params, - result = {}, + resultDetails = null, browser = this.window.gBrowser.selectedBrowser ) { // No point in setting these because we'll handleRevert() a few rows below. @@ -1286,7 +1286,7 @@ class UrlbarInput { } // Notify about the start of navigation. - this._notifyStartNavigation(result); + this._notifyStartNavigation(resultDetails); try { this.window.openTrustedLinkIn(url, openUILinkWhere, params); @@ -1407,7 +1407,7 @@ class UrlbarInput { * if they aren't being used, e.g. WebNavigation. * * @param {UrlbarResult} result - * The result that was selected, if any. + * Details of the result that was selected, if any. */ _notifyStartNavigation(result) { Services.obs.notifyObservers({ result }, "urlbar-user-start-navigation");

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Revert "Bug 31764: Fix for error when navigating via 'Paste and go'"
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 45677fd3bc4fd9b69216bb25efadcbac3026672f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 11:57:52 2020 +0100 Revert "Bug 31764: Fix for error when navigating via 'Paste and go'" This reverts commit 59d89229b68f8fbaa46e910a9bd03a6b26e8403e. With #32470 we backported Mozilla's fix for this issue. --- 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 21a7a5d9910f..131d2ecc8ca8 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, null); + this._loadURL(url, where, openParams); } handleRevert() {

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit e8411693ccfa757557eecd97baaa8bb12a5c87dc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 15 13:16:44 2020 +0100 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 32948: Make referer behavior consistent regardless of private browing mode status --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1e054bf4a0c9..0176e8feb64d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -137,6 +137,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should // not leak that difference if possible. pref("dom.netinfo.enabled", false); +pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 77970cdee3ba6c294a7acfe9d9b5a2ae9511e579 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 8 15:30:20 2020 +0000 fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides. --- tbb-tests/browser_tor_TB4.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index c1f748a3338f..032386e22ae1 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -64,18 +64,7 @@ let expectedPrefs = [ ["browser.display.max_font_attempts",10], ["browser.display.max_font_count",10], ["gfx.downloadable_fonts.fallback_delay", -1], - ["general.appname.override", "Netscape"], - ["general.appversion.override", "5.0 (Windows)"], - ["general.oscpu.override", "Windows NT 6.1"], - ["general.platform.override", "Win32"], - ["general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0"], - ["general.productSub.override", "20100101"], - ["general.buildID.override", "20100101"], ["browser.startup.homepage_override.buildID", "20100101"], - ["general.useragent.vendor", ""], - ["general.useragent.vendorSub", ""], - ["dom.enable_performance", false], - ["browser.zoom.siteSpecific", false], // Third party stuff ["network.cookie.cookieBehavior", 1],

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit da7e8b35800a41249b5c2a847c4f931c4bf6582a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 9 10:13:29 2020 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Remaining clean-up done in #27268. --- browser/app/profile/000-tor-browser.js | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fb99eb6ed7d1..1e054bf4a0c9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -114,34 +114,14 @@ pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false); pref("gfx.downloadable_fonts.fallback_delay", -1); -pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "5.0 (Windows)"); -pref("general.oscpu.override", "Windows NT 6.1"); -pref("general.platform.override", "Win32"); -pref("general.productSub.override", "20100101"); -pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); -pref("general.useragent.vendor", ""); -pref("general.useragent.vendorSub", ""); -pref("dom.enable_performance", false); -pref("browser.zoom.siteSpecific", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) -pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 -// Disable video statistics fingerprinting vector (bug 15757) -pref("media.video_stats.enabled", false); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); -// Disable device sensors as possible fingerprinting vector (bug 15758) -pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 -pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" -pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 -pref("privacy.use_utc_timezone", true); -pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthesis API pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API -pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now @@ -152,6 +132,11 @@ pref("browser.cache.frecency_experiment", -1); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// Disable network information API everywhere. It gets spoofed in bug 1372072 +// but, alas, the behavior is inconsistent across platforms, see: +// https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should +// not leak that difference if possible. +pref("dom.netinfo.enabled", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation @@ -207,8 +192,7 @@ pref("media.eme.enabled", false); pref("media.mediadrm-widevinecdm.visible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads // some additional addons that we have not reviewed. Turn all that off. -pref("devtools.webide.autoinstallADBHelper", false); -pref("devtools.webide.autoinstallFxdtAdapters", false); +pref("devtools.webide.autoinstallADBExtension", false); pref("devtools.webide.enabled", false); // The in-browser debugger for debugging chrome code is not coping with our // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 32414: Make Services.search.addEngine obey FPI
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 2197dad64e5c3752b1daeab0c676fda07880144c Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jan 10 17:54:18 2020 +0100 Bug 32414: Make Services.search.addEngine obey FPI --- browser/base/content/browser-pageActions.js | 70 ++++++++++++---------- mobile/android/chrome/content/browser.js | 15 ++++- .../processsingleton/MainProcessSingleton.jsm | 8 ++- toolkit/components/search/SearchEngine.jsm | 6 +- toolkit/components/search/SearchService.jsm | 5 +- toolkit/components/search/SearchUtils.jsm | 4 +- toolkit/components/search/nsISearchService.idl | 7 ++- 7 files changed, 74 insertions(+), 41 deletions(-) diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js index 33680b2b4c1a..b2aefba866dd 100644 --- a/browser/base/content/browser-pageActions.js +++ b/browser/base/content/browser-pageActions.js @@ -1248,38 +1248,46 @@ BrowserPageActions.addSearchEngine = { }, _installEngine(uri, image) { - Services.search.addEngine(uri, image, false).then( - engine => { - showBrowserPageActionFeedback(this.action); - }, - errorCode => { - if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { - // Download error is shown by the search service - return; + Services.search + .addEngine( + uri, + image, + false, + null, + gBrowser.selectedBrowser.contentPrincipal + ) + .then( + engine => { + showBrowserPageActionFeedback(this.action); + }, + errorCode => { + if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { + // Download error is shown by the search service + return; + } + const kSearchBundleURI = + "chrome://global/locale/search/search.properties"; + let searchBundle = Services.strings.createBundle(kSearchBundleURI); + let brandBundle = document.getElementById("bundle_brand"); + let brandName = brandBundle.getString("brandShortName"); + let title = searchBundle.GetStringFromName( + "error_invalid_engine_title" + ); + let text = searchBundle.formatStringFromName( + "error_duplicate_engine_msg", + [brandName, uri], + 2 + ); + Services.prompt.QueryInterface(Ci.nsIPromptFactory); + let prompt = Services.prompt.getPrompt( + gBrowser.contentWindow, + Ci.nsIPrompt + ); + prompt.QueryInterface(Ci.nsIWritablePropertyBag2); + prompt.setPropertyAsBool("allowTabModal", true); + prompt.alert(title, text); } - const kSearchBundleURI = - "chrome://global/locale/search/search.properties"; - let searchBundle = Services.strings.createBundle(kSearchBundleURI); - let brandBundle = document.getElementById("bundle_brand"); - let brandName = brandBundle.getString("brandShortName"); - let title = searchBundle.GetStringFromName( - "error_invalid_engine_title" - ); - let text = searchBundle.formatStringFromName( - "error_duplicate_engine_msg", - [brandName, uri], - 2 - ); - Services.prompt.QueryInterface(Ci.nsIPromptFactory); - let prompt = Services.prompt.getPrompt( - gBrowser.contentWindow, - Ci.nsIPrompt - ); - prompt.QueryInterface(Ci.nsIWritablePropertyBag2); - prompt.setPropertyAsBool("allowTabModal", true); - prompt.alert(title, text); - } - ); + ); }, }; diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 5f5ac123835c..cacf26587091 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -7253,7 +7253,10 @@ var SearchEngines = { return; } - this.addOpenSearchEngine(engines[data.button]); + this.addOpenSearchEngine( + engines[data.button], + browser.contentPrincipal + ); engines.splice(data.button, 1); if (engines.length < 1) { @@ -7269,9 +7272,15 @@ var SearchEngines = { }); }, - addOpenSearchEngine: async function addOpenSearchEngine(engine) { + addOpenSearchEngine: async function addOpenSearchEngine(engine, principal) { try { - await Services.search.addEngine(engine.url, engine.iconURL, false); + await Services.search.addEngine( + engine.url, + engine.iconURL, + false, + null, + principal + ); // Display a toast confirming addition of new search engine. Snackbars.show( Strings.browser.formatStringFromName( diff --git a/toolkit/components/processsingleton/MainProcessSingleton.jsm b/toolkit/components/processsingleton/MainProcessSingleton.jsm index 1e8caebd6ebc..69372bef1742 100644 --- a/toolkit/components/processsingleton/MainProcessSingleton.jsm +++ b/toolkit/components/processsingleton/MainProcessSingleton.jsm @@ -69,7 +69,13 @@ MainProcessSingleton.prototype = { } Services.search - .addEngine(engineURL.spec, iconURL ? iconURL.spec : null, true) + .addEngine( + engineURL.spec, + iconURL ? iconURL.spec : null, + true, + null, + browser.contentPrincipal + ) .catch(ex => Cu.reportError( "Unable to add search engine to the search service: " + ex diff --git a/toolkit/components/search/SearchEngine.jsm b/toolkit/components/search/SearchEngine.jsm index d84a3a23516c..c4b5b1ce556e 100644 --- a/toolkit/components/search/SearchEngine.jsm +++ b/toolkit/components/search/SearchEngine.jsm @@ -806,6 +806,8 @@ SearchEngine.prototype = { _iconUpdateURL: null, /* The extension ID if added by an extension. */ _extensionID: null, + /* The principal from which the engine was added. */ + _contentPrincipal: null, // Built in search engine extensions. _isBuiltin: false, @@ -851,7 +853,7 @@ SearchEngine.prototype = { '_initFromURIAndLoad: Downloading engine from: "' + loadURI.spec + '".' ); - var chan = SearchUtils.makeChannel(loadURI); + var chan = SearchUtils.makeChannel(loadURI, this._contentPrincipal); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); @@ -1231,7 +1233,7 @@ SearchEngine.prototype = { this.name + '"' ); - var chan = SearchUtils.makeChannel(uri); + var chan = SearchUtils.makeChannel(uri, this._contentPrincipal); let iconLoadCallback = function(byteArray, engine) { // This callback may run after we've already set a preferred icon, diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index e869be458c7d..772edada7bfd 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -2311,7 +2311,7 @@ SearchService.prototype = { return this.addEngineWithDetails(params.name, params, isReload); }, - async addEngine(engineURL, iconURL, confirm, extensionID) { + async addEngine(engineURL, iconURL, confirm, extensionID, contentPrincipal) { SearchUtils.log('addEngine: Adding "' + engineURL + '".'); await this.init(true); let errCode; @@ -2325,6 +2325,9 @@ SearchService.prototype = { if (extensionID) { engine._extensionID = extensionID; } + if (contentPrincipal) { + engine._contentPrincipal = contentPrincipal; + } errCode = await new Promise(resolve => { engine._installCallback = function(errorCode) { resolve(errorCode); diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm index f9550307e875..8b630afbdd6e 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm @@ -133,13 +133,13 @@ var SearchUtils = { * The URL string from which to create an nsIChannel. * @returns an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, principal) { try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + principal || Services.scriptSecurityManager.getSystemPrincipal(), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, Ci.nsIContentPolicy.TYPE_OTHER diff --git a/toolkit/components/search/nsISearchService.idl b/toolkit/components/search/nsISearchService.idl index 2e085985a976..4a8f4015fb28 100644 --- a/toolkit/components/search/nsISearchService.idl +++ b/toolkit/components/search/nsISearchService.idl @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" +#include "nsIPrincipal.idl" interface nsIURI; interface nsIInputStream; @@ -288,11 +289,15 @@ interface nsISearchService : nsISupports * @param extensionID [optional] * Optional: The correct extensionID if called by an add-on. * + * @param principal [optional] + * Optional: The principal from which the search engine was added. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ Promise addEngine(in AString engineURL, in AString iconURL, in boolean confirm, - [optional] in AString extensionID); + [optional] in AString extensionID, + [optional] in nsIPrincipal principal); /** * Adds a new search engine, without asking the user for confirmation and

1 0

[tor-browser-build/master] Bug 32976: Build and bundle geckodriver
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit f531a004aaa169d9a4a06a3b6d7c04c6fd812f9c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 19 21:06:37 2020 +0000 Bug 32976: Build and bundle geckodriver Geckodriver is not built by default in release builds. However, it's useful if we build it reproducibly so we can avoid trusting some binary downloaded from the Internet for our QA and Selenium related work. Only the 64bit Linux version is built and included as I doubt we'll need geckodriver on anything else for our purposes. --- projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index b42b301..22c5b5d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -151,6 +151,9 @@ rm -f js/src/configure [% END %] [% IF c("var/linux") %] + [% IF c("var/linux-x86_64") %] + cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir + [% END %] cp -a obj-*/dist/firefox/* $distdir/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $distdir/Browser/firefox-bin @@ -213,6 +216,8 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir [% IF c("var/linux-x86_64") %] + # No need for an unstripped geckodriver + strip geckodriver mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -258,6 +263,10 @@ END; tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', }) %] +[% c('tar', { + tar_src => [ 'geckodriver' ], + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz', + }) %] [% END %] [% c('zip', { diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 19d2885..59517cd 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -33,6 +33,8 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection +# We want to bundle an own geckodriver, so we can use it for QA and other work +ac_add_options --enable-geckodriver # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2c72e03..4d44f12 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -292,6 +292,7 @@ SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz + cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ [% END -%] [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32976_v3'
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit e1127b38167b902a1b77b14b8c06cfbce9bae653 Merge: 6c24592 f531a00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 27 12:25:59 2020 +0100 Merge remote-tracking branch 'gk/bug_32976_v3' projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug
by boklm＠torproject.org 23 Jan '20

23 Jan '20

commit 3b2165b8be4f7fd7889c17cbb39a4348f7666bc8 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jan 13 20:41:14 2020 +0000 Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug Using a weak RNG for the form boundary allows a website operator to perform several attacks on users (as outlined in https://trac.torproject.org/projects/tor/ticket/22919) These include: - Identifying Windows users based on the unseeded RNG - Identify the number of form submissions that have occurred cross-origin between same-origin submissions Additionally, a predictable boundary makes it possible to forge a boundary in the middle of a file upload. Differential Revision: https://phabricator.services.mozilla.com/D56056 --HG-- extra : moz-landing-system : lando --- dom/html/HTMLFormSubmission.cpp | 7 ++++--- mfbt/RandomNum.cpp | 8 ++++++++ mfbt/RandomNum.h | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dom/html/HTMLFormSubmission.cpp b/dom/html/HTMLFormSubmission.cpp index baaed020ec3f..384ca3661426 100644 --- a/dom/html/HTMLFormSubmission.cpp +++ b/dom/html/HTMLFormSubmission.cpp @@ -37,6 +37,7 @@ #include "mozilla/dom/Directory.h" #include "mozilla/dom/File.h" #include "mozilla/StaticPrefs.h" +#include "mozilla/RandomNum.h" namespace mozilla { namespace dom { @@ -367,9 +368,9 @@ FSMultipartFormData::FSMultipartFormData(nsIURI* aActionURL, mTotalLength = 0; mBoundary.AssignLiteral("---------------------------"); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); } FSMultipartFormData::~FSMultipartFormData() { diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp index 69f19e9d01fa..c3bb9ecef444 100644 --- a/mfbt/RandomNum.cpp +++ b/mfbt/RandomNum.cpp @@ -150,4 +150,12 @@ MFBT_API Maybe<uint64_t> RandomUint64() { #endif } +MFBT_API uint64_t RandomUint64OrDie() { + Maybe<uint64_t> maybeRandomNum = RandomUint64(); + + MOZ_RELEASE_ASSERT(maybeRandomNum.isSome()); + + return maybeRandomNum.value(); +} + } // namespace mozilla diff --git a/mfbt/RandomNum.h b/mfbt/RandomNum.h index 5af510d621a6..5d392c9a6819 100644 --- a/mfbt/RandomNum.h +++ b/mfbt/RandomNum.h @@ -30,6 +30,12 @@ namespace mozilla { */ MFBT_API Maybe<uint64_t> RandomUint64(); +/** + * Like RandomUint64, but always returns a uint64_t or crashes with an assert + * if the underlying RandomUint64 call failed. + */ +MFBT_API uint64_t RandomUint64OrDie(); + } // namespace mozilla #endif // mozilla_RandomNum_h_

1 0

[tor-browser-build/master] Bug 33012: Remove unneeded namecoin and snowflake definitions
by gk＠torproject.org 21 Jan '20

21 Jan '20

commit 6c245925b40b13f8508ca3ade45425338a56acdf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 21 13:30:28 2020 +0100 Bug 33012: Remove unneeded namecoin and snowflake definitions --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 213971e..f0e22a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -232,8 +232,6 @@ targets: android_min_api_armv7: 16 android_min_api_x86: 16 android_min_api_x86_64: 21 - snowflake: 0 - namecoin: 0 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: @@ -332,7 +330,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python @@ -361,7 +358,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 32435: Add WebAssembly support for RLBox
by boklm＠torproject.org 21 Jan '20

21 Jan '20

commit a1eab9035af5b5d6cc8ab21615676f9f237c074f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 21 08:03:42 2020 +0000 Bug 32435: Add WebAssembly support for RLBox --- projects/clang/build | 5 ++++- rbm.conf | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/clang/build b/projects/clang/build index 825b21e..d95e9af 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -40,7 +40,10 @@ cd llvm export LLVM_HOME=$(pwd) mkdir build cd build -cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME +cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/rbm.conf b/rbm.conf index 73c617b..213971e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -262,6 +262,8 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 + # We only support RLBox on the nightly channel and x86_64 for now + rlbox: '[% c("var/nightly") %]' linux-i686: arch: i686 var:

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.3 and 9.0.4
by sysrqb＠torproject.org 20 Jan '20

20 Jan '20

commit e8afa21c48b081abb0581287a0b891c02cc28799 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jan 20 14:30:22 2020 +0000 Fold in stable changelog for 9.0.3 and 9.0.4 --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e8e5741..a123447 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,30 @@ Tor Browser 9.5a4 -- January 10 2020 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs +Tor Browser 9.0.4 -- January 9 2020 + * All Platforms + * Update Firefox to 68.4.1esr + +Tor Browser 9.0.3 -- January 7 2020 + * All Platforms + * Update Firefox to 68.4.0esr + * Bump NoScript to 11.0.11 + * Translations update + * Update OpenPGP keyring + * Bug 32606: Set up default bridge at Georgetown University + * Bug 32659: Remove IPv6 address of default bridge + * Bug 32547: Add new default bridge at UMN + * Bug 31855: Remove End of Year Fundraising Campaign from about:tor + * Windows + OS X + Linux + * Bump Tor to 0.4.2.5 + * Update Tor Launcher to 0.2.20.5 + * Bug 32636: Clean up locales shipped with Tor Launcher + * Android + * Bug 32405: Crash immediately after bootstrap on Android + * Build System + * Linux + * Bug 32676: Create a tarball with all Linux x86_64 language packs + Tor Browser 9.0.2 -- December 3 2019 * All Platforms * Update Firefox to 68.3.0esr

1 0

[tor-browser-build/master] Bug 32979: Update README to add File::Slurp to the list of dependencies
by gk＠torproject.org 17 Jan '20

17 Jan '20

commit 14bb4de90418ce84b8bf603e0f7392c0a08dfbd1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 16 19:52:02 2020 +0100 Bug 32979: Update README to add File::Slurp to the list of dependencies --- README | 3 ++- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index 5dbf77e..8e97e2f 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ You also need a few perl modules installed: - File::Temp - Path::Tiny - File::Path +- File::Slurp - File::Copy::Recursive - String::ShellQuote - Sort::Versions @@ -42,7 +43,7 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git runc \ + libfile-copy-recursive-perl libfile-slurp-perl git runc \ mercurial The build system is based on rbm, which is included as a git submodule diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index 4e84709..92b35e8 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -19,6 +19,7 @@ - libdata-uuid-perl - libdata-dump-perl - libfile-copy-recursive-perl + - libfile-slurp-perl - libgtk2.0-dev - curl - runc

1 0

[tor-browser-build/master] Add missing Changelog item
by gk＠torproject.org 12 Jan '20

12 Jan '20

commit 4e4ffefc35645faafe4af93d78965c6b073e5be0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:03:24 2020 +0000 Add missing Changelog item --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b60ee3b..e8e5741 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1509,6 +1509,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 26049: Reduce delay for showing update prompt to 1 hour * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer) * Bug 19910: Rip out optimistic data socks handshake variant (#3875) @@ -1696,6 +1697,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 17965: Isolate HPKP and HSTS to URL bar domain * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 22564: Hide Firefox Sync * Bug 25090: Disable updater telemetry

1 0

[tor-browser-build/master] Bump release date in ChangeLog
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 99944666ff3784b48ddd3d7e3be536b7545ac4b6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:30:14 2020 +0000 Bump release date in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3a6f424..b60ee3b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.5a4 -- January 9 2020 +Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11

1 0

[tor-browser-build/master] Changelog update and versions bump for 68.4.1esr
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 32ed0c3d083b3eaf4453af5e912590c59030c8d1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:24:40 2020 +0000 Changelog update and versions bump for 68.4.1esr --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9082c04..f780084 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.0 + firefox_platform_version: 68.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 96eddbe..3a6f424 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.5a4 -- January 8 2020 +Tor Browser 9.5a4 -- January 9 2020 * All Platforms - * Update Firefox to 68.4.0esr + * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11 * Translations update * Update OpenPGP keyring diff --git a/rbm.conf b/rbm.conf index 5ac3328..73c617b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a3 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Preparing 9.0.4
by gk＠torproject.org 08 Jan '20

08 Jan '20

commit c9dc6d56b935098444d79d3b9234cff7cc25b5fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 8 07:36:28 2020 +0000 Preparing 9.0.4 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b6ddd17..f50af8c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.0 + firefox_platform_version: 68.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c603a11..78dd726 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.0.4 -- January 9 2020 + * All Platforms + * Update Firefox to 68.4.1esr + Tor Browser 9.0.3 -- January 7 2020 * All Platforms * Update Firefox to 68.4.0esr diff --git a/rbm.conf b/rbm.conf index 57e0aad..d8fccd1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.3' - torbrowser_build: 'build4' + torbrowser_version: '9.0.4' + torbrowser_build: 'build1' torbrowser_incremental_from: - 9.0.2 + - 9.0.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-9.0] Use build4 for 9.0.3
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 064e0a13d42d257e46a1c64bf876f884361413de Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:27:07 2020 +0000 Use build4 for 9.0.3 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 134401f..57e0aad 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.3' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 9.0.2 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Use actually our 68.4.0esr branch
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit bcf0405c96522b2754b88cd6b7a84fc46fac3dd4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:25:15 2020 +0000 Use actually our 68.4.0esr branch --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 16c0c34..b6ddd17 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.3.0 + firefox_platform_version: 68.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha

1 0

[tor-browser-build/master] Small Changelog fixups
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 637e37bff412b587970791dafdb3174eb359d6b3 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:22:13 2020 +0000 Small Changelog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 48c4249..96eddbe 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ - Tor Browser 9.5a4 -- January 7 2020 +Tor Browser 9.5a4 -- January 8 2020 * All Platforms * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 @@ -17,7 +17,7 @@ * Bug 32674: Point the about:tor "Get involved" link to the community portal * Build System * All Platforms - * Bump clang to 8.0.1 + * Bug 32739: Bump clang to 8.0.1 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs

1 0

[tor-browser-build/maint-9.0] Fix typo in Changelog
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 6fd91552452a71b1bfd5c82dec93b3497dad5a30 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:07:49 2020 +0000 Fix typo in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3e338f3..c603a11 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,7 +15,7 @@ Tor Browser 9.0.3 -- January 7 2020 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System - * Windows + OS X + Linux + * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs Tor Browser 9.0.2 -- December 3 2019

1 0