- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 4 commits: fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9b87c73a by Pier Angelo Vendrame at 2023-03-29T16:56:32+02:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module Bug 41698 - - - - - 071ef206 by Pier Angelo Vendrame at 2023-03-29T16:56:49+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 41698: Reword the recommendation badges in about:addons We need to add a new commit for all base browser strings - - - - - 35133d69 by Pier Angelo Vendrame at 2023-03-29T16:56:49+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 663cd8e2 by Pier Angelo Vendrame at 2023-03-29T16:56:50+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 3 changed files: - browser/locales/en-US/browser/languageNotification.ftl - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -2,6 +2,13 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# These strings are used by the Base Browser part of the changeset, not only for +# the language notification. +# TODO: Rename this file to make this clearer + + +## Language notification + # $language is the language Tor Browser is displayed in (already translated) language-notification-label-system = { -brand-short-name } has set your display language to { $language } based on your system’s language. # This is shown when the system language is not supported, so we fall back to another language instead. @@ -9,6 +16,15 @@ language-notification-label-system = { -brand-short-name } has set your display language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +## Fullscreen/maximization notification shown when letterboxing is disabled + basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. basebrowser-rfp-restore-window-size-button-label = Restore basebrowser-rfp-restore-window-size-button-ak = R + + +## Tooltip for the about:addons recommended badge + +basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance +basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -24,6 +24,8 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> + <link rel="localization" href="browser/languageNotification.ftl"/> +  <script defer src="chrome://mozapps/content/extensions/aboutaddonsCommon.js"></script> <script defer src="chrome://mozapps/content/extensions/abuse-reports.js"></script> @@ -153,7 +155,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-recommended2" hidden> </a> <a class="addon-badge addon-badge-line" @@ -167,7 +168,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-verified2" hidden> </a> <a class="addon-badge addon-badge-private-browsing-allowed" ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4885,6 +4885,29 @@ async function initialize() { ); } } + + // At the moment we need to do this, because Weblate still does not support + // attributes in Fluent. + const [recommended, verified] = await document.l10n.formatValues([ + { id: "basebrowser-addon-badge-recommended" }, + { id: "basebrowser-addon-badge-verified" }, + ]); + + importTemplate("card"); + _templates.card.content + .querySelector(".addon-badge-recommended") + .setAttribute("title", recommended); + _templates.card.content + .querySelector(".addon-badge-verified") + .setAttribute("title", verified); + + // We also update any template copy that has already been created. + for (const badge of document.querySelectorAll(".addon-badge-recommended")) { + badge.setAttribute("title", recommended); + } + for (const badge of document.querySelectorAll(".addon-badge-verified")) { + badge.setAttribute("title", verified); + } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a1faa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a1faa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 2 commits: Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4ad8902a by hackademix at 2023-03-29T15:14:42+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 9e31ce5b by hackademix at 2023-03-29T15:15:03+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/locales/en-US/browser/languageNotification.ftl - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -8,3 +8,7 @@ language-notification-label-system = { -brand-short-name } has set your display # $language is the language Tor Browser is displayed in (already translated). language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. +basebrowser-rfp-restore-window-size-button-label = Restore +basebrowser-rfp-restore-window-size-button-ak = R ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -22,16 +22,110 @@ const kPrefLetterboxingTesting = "privacy.resistFingerprinting.letterboxing.testing"; const kTopicDOMWindowOpened = "domwindowopened"; -var logConsole; -function log(msg) { - if (!logConsole) { - logConsole = console.createInstance({ - prefix: "RFPHelper.jsm", - maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", - }); +const kPrefResizeWarnings = "privacy.resistFingerprinting.resizeWarnings"; + +XPCOMUtils.defineLazyGetter(this, "logConsole", () => + console.createInstance({ + prefix: "RFPHelper.jsm", + maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", + }) +); + +function log(...args) { + logConsole.log(...args); +} + +function forEachWindow(callback) { + const windowList = Services.wm.getEnumerator("navigator:browser"); + while (windowList.hasMoreElements()) { + const win = windowList.getNext(); + if (win.gBrowser && !win.closed) { + try { + callback(win); + } catch (e) { + logConsole.error(e); + } + } + } +} + + +async function windowResizeHandler(aEvent) { + if (RFPHelper.letterboxingEnabled) { + return; + } + if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + return; + } + + const window = aEvent.currentTarget; + + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => window.setTimeout(resolve, 0)); + switch (window.windowState) { + case window.STATE_MAXIMIZED: + case window.STATE_FULLSCREEN: + break; + default: + return; + } + + // Do not add another notification if one is already showing. + const kNotificationName = "rfp-window-resize-notification"; + let box = window.gNotificationBox; + if (box.getNotificationWithValue(kNotificationName)) { + return; } - logConsole.log(msg); + // Rate-limit showing our notification if needed. + if (Date.now() - (windowResizeHandler.timestamp || 0) < 1000) { + return; + } + windowResizeHandler.timestamp = Date.now(); + + const decreaseWarningsCount = () => { + const currentCount = Services.prefs.getIntPref(kPrefResizeWarnings); + if (currentCount > 0) { + Services.prefs.setIntPref(kPrefResizeWarnings, currentCount - 1); + } + }; + + const [label, accessKey] = await window.document.l10n.formatValues([ + { id: "basebrowser-rfp-restore-window-size-button-label" }, + { id: "basebrowser-rfp-restore-window-size-button-ak" }, + ]); + + const buttons = [ + { + label, + accessKey, + popup: null, + callback() { + // reset notification timer to work-around resize race conditions + windowResizeHandler.timestamp = Date.now(); + // restore the original (rounded) size we had stored on window startup + let { _rfpOriginalSize } = window; + window.setTimeout(() => { + window.resizeTo(_rfpOriginalSize.width, _rfpOriginalSize.height); + }, 0); + }, + }, + ]; + + box.appendNotification( + kNotificationName, + { + label: { "l10n-id": "basebrowser-rfp-maximize-warning-message" }, + priority: box.PRIORITY_WARNING_LOW, + eventCallback(event) { + if (event === "dismissed") { + // user manually dismissed the notification + decreaseWarningsCount(); + } + }, + }, + buttons + ); } class _RFPHelper { @@ -158,7 +252,11 @@ class _RFPHelper { _handleResistFingerprintingChanged() { if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { this._addRFPObservers(); + Services.ww.registerNotification(this); + forEachWindow(win => this._attachWindow(win)); } else { + forEachWindow(win => this._detachWindow(win)); + Services.ww.unregisterNotification(this); this._removeRFPObservers(); } } @@ -295,13 +393,11 @@ class _RFPHelper { } _handleLetterboxingPrefChanged() { - if (Services.prefs.getBoolPref(kPrefLetterboxing, false)) { - Services.ww.registerNotification(this); - this._attachAllWindows(); - } else { - this._detachAllWindows(); - Services.ww.unregisterNotification(this); - } + this.letterboxingEnabled = Services.prefs.getBoolPref( + kPrefLetterboxing, + false + ); + forEachWindow(win => this._updateSizeForTabsInWindow(win)); } // The function to parse the dimension set from the pref value. The pref value @@ -402,11 +498,13 @@ class _RFPHelper { let logPrefix = `_roundContentSize[${Math.random()}]`; log(logPrefix); let win = aBrowser.ownerGlobal; + let browserContainer = aBrowser .getTabBrowser() .getBrowserContainer(aBrowser); let browserParent = aBrowser.parentElement; browserParent.classList.remove("exclude-letterboxing"); + let [ [contentWidth, contentHeight], [parentWidth, parentHeight], @@ -419,6 +517,27 @@ class _RFPHelper { ]) ); + if ( + !win._rfpSizeOffset || + (win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height) + ) { + const BASELINE_ROUNDING = 10; + const offset = s => + s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + + win._rfpSizeOffset = { + width: offset(parentWidth), + height: offset(parentHeight), + }; + log( + `${logPrefix} Window size offsets %o (from %s, %s)`, + win._rfpSizeOffset, + parentWidth, + parentHeight + ); + } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -437,6 +556,16 @@ class _RFPHelper { }); let result; + + if (!this.letterboxingEnabled) { + const offset = win._rfpSizeOffset; + result = r(aWidth - offset.width, aHeight - offset.height); + log( + `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` + ); + return result; + } + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. @@ -554,7 +683,6 @@ class _RFPHelper { _updateSizeForTabsInWindow(aWindow) { let tabBrowser = aWindow.gBrowser; - tabBrowser.tabpanels?.classList.add("letterboxing"); for (let tab of tabBrowser.tabs) { @@ -564,10 +692,18 @@ class _RFPHelper { // we need to add this class late because otherwise new windows get maximized aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); + if (!aWindow._rfpOriginalSize) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } }); } _attachWindow(aWindow) { + aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); const resizeObserver = (aWindow._rfpResizeObserver = new aWindow.ResizeObserver( @@ -585,19 +721,7 @@ class _RFPHelper { this._updateSizeForTabsInWindow(aWindow); } - _attachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._attachWindow(win); - } - } _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; @@ -614,20 +738,7 @@ class _RFPHelper { let browser = tab.linkedBrowser; this._resetContentSize(browser); } - } - - _detachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._detachWindow(win); - } + aWindow.removeEventListener("sizemodechange", windowResizeHandler); } _handleDOMWindowOpened(win) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f23c4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f23c4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f23c4fda by Richard Pospesel at 2023-03-29T11:38:31+00:00 fixup! Firefox preference overrides. Bug 41701: Reporting an extension does not work - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -452,6 +452,9 @@ pref("browser.discovery.enabled", false); pref("extensions.webextensions.restrictedDomains", ""); // Don't give Mozilla-recommended third-party extensions special privileges. pref("extensions.postDownloadThirdPartyPrompt", false); +// tor-browser#41701: Reporting an extension does not work +// disable extension reporting since the request goes to Mozilla and is rejected anyway (HTTP 400) +pref("extensions.abuseReport.enabled", false); // We are already providing the languages we support in multi-lingual packages. // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f23c4fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f23c4fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5a1faa00 by Richard Pospesel at 2023-03-29T11:35:07+00:00 fixup! Firefox preference overrides. Bug 41701: Reporting an extension does not work - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -448,6 +448,9 @@ pref("browser.discovery.enabled", false); pref("extensions.webextensions.restrictedDomains", ""); // Don't give Mozilla-recommended third-party extensions special privileges. pref("extensions.postDownloadThirdPartyPrompt", false); +// tor-browser#41701: Reporting an extension does not work +// disable extension reporting since the request goes to Mozilla and is rejected anyway (HTTP 400) +pref("extensions.abuseReport.enabled", false); // We are already providing the languages we support in multi-lingual packages. // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5a1faa0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5a1faa0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: db5d0d31 by hackademix at 2023-03-29T12:33:11+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser - - - - - 1 changed file: - browser/components/torconnect/content/torconnect-urlbar.inc.xhtml Changes: ===================================== browser/components/torconnect/content/torconnect-urlbar.inc.xhtml ===================================== @@ -3,6 +3,7 @@ <hbox id="torconnect-box" class="urlbar-icon-wrapper urlbar-page-action" role="status" + align="center" hidden="true"> <hbox id="torconnect-container"> <label id="torconnect-label"/> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/db5d0d3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/db5d0d3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 4 commits: Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 16c5a240 by hackademix at 2023-03-28T22:53:50+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 1d0cc334 by hackademix at 2023-03-28T23:30:47+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - e32a6cd3 by hackademix at 2023-03-28T23:33:12+02:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js - - - - - be88af1c by hackademix at 2023-03-29T09:52:37+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 5 changed files: - browser/app/profile/000-tor-browser.js - browser/locales/en-US/browser/languageNotification.ftl - toolkit/components/resistfingerprinting/RFPHelper.jsm - toolkit/torbutton/chrome/content/torbutton.js - toolkit/torbutton/chrome/locale/en-US/torbutton.properties Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -65,11 +65,6 @@ pref("extensions.torbutton.use_nontor_proxy", false); // State prefs: pref("extensions.torbutton.startup", false); -// This is only used when letterboxing is disabled. -// See #7255 for details. We display the warning three times to make sure the -// user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 3); - // Security prefs: pref("extensions.torbutton.resize_new_windows", false); pref("extensions.torbutton.launch_warning", true); ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -8,3 +8,7 @@ language-notification-label-system = { -brand-short-name } has set your display # $language is the language Tor Browser is displayed in (already translated). language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. +basebrowser-rfp-restore-window-size-button-label = Restore +basebrowser-rfp-restore-window-size-button-ak = R ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -22,16 +22,110 @@ const kPrefLetterboxingTesting = "privacy.resistFingerprinting.letterboxing.testing"; const kTopicDOMWindowOpened = "domwindowopened"; -var logConsole; -function log(msg) { - if (!logConsole) { - logConsole = console.createInstance({ - prefix: "RFPHelper.jsm", - maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", - }); +const kPrefResizeWarnings = "privacy.resistFingerprinting.resizeWarnings"; + +XPCOMUtils.defineLazyGetter(this, "logConsole", () => + console.createInstance({ + prefix: "RFPHelper.jsm", + maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", + }) +); + +function log(...args) { + logConsole.log(...args); +} + +function forEachWindow(callback) { + const windowList = Services.wm.getEnumerator("navigator:browser"); + while (windowList.hasMoreElements()) { + const win = windowList.getNext(); + if (win.gBrowser && !win.closed) { + try { + callback(win); + } catch (e) { + logConsole.error(e); + } + } + } +} + + +async function windowResizeHandler(aEvent) { + if (RFPHelper.letterboxingEnabled) { + return; + } + if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + return; + } + + const window = aEvent.currentTarget; + + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => window.setTimeout(resolve, 0)); + switch (window.windowState) { + case window.STATE_MAXIMIZED: + case window.STATE_FULLSCREEN: + break; + default: + return; + } + + // Do not add another notification if one is already showing. + const kNotificationName = "rfp-window-resize-notification"; + let box = window.gNotificationBox; + if (box.getNotificationWithValue(kNotificationName)) { + return; } - logConsole.log(msg); + // Rate-limit showing our notification if needed. + if (Date.now() - (windowResizeHandler.timestamp || 0) < 1000) { + return; + } + windowResizeHandler.timestamp = Date.now(); + + const decreaseWarningsCount = () => { + const currentCount = Services.prefs.getIntPref(kPrefResizeWarnings); + if (currentCount > 0) { + Services.prefs.setIntPref(kPrefResizeWarnings, currentCount - 1); + } + }; + + const [label, accessKey] = await window.document.l10n.formatValues([ + { id: "basebrowser-rfp-restore-window-size-button-label" }, + { id: "basebrowser-rfp-restore-window-size-button-ak" }, + ]); + + const buttons = [ + { + label, + accessKey, + popup: null, + callback() { + // reset notification timer to work-around resize race conditions + windowResizeHandler.timestamp = Date.now(); + // restore the original (rounded) size we had stored on window startup + let { _rfpOriginalSize } = window; + window.setTimeout(() => { + window.resizeTo(_rfpOriginalSize.width, _rfpOriginalSize.height); + }, 0); + }, + }, + ]; + + box.appendNotification( + kNotificationName, + { + label: { "l10n-id": "basebrowser-rfp-maximize-warning-message" }, + priority: box.PRIORITY_WARNING_LOW, + eventCallback(event) { + if (event === "dismissed") { + // user manually dismissed the notification + decreaseWarningsCount(); + } + }, + }, + buttons + ); } class _RFPHelper { @@ -158,7 +252,11 @@ class _RFPHelper { _handleResistFingerprintingChanged() { if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { this._addRFPObservers(); + Services.ww.registerNotification(this); + forEachWindow(win => this._attachWindow(win)); } else { + forEachWindow(win => this._detachWindow(win)); + Services.ww.unregisterNotification(this); this._removeRFPObservers(); } } @@ -295,13 +393,11 @@ class _RFPHelper { } _handleLetterboxingPrefChanged() { - if (Services.prefs.getBoolPref(kPrefLetterboxing, false)) { - Services.ww.registerNotification(this); - this._attachAllWindows(); - } else { - this._detachAllWindows(); - Services.ww.unregisterNotification(this); - } + this.letterboxingEnabled = Services.prefs.getBoolPref( + kPrefLetterboxing, + false + ); + forEachWindow(win => this._updateSizeForTabsInWindow(win)); } // The function to parse the dimension set from the pref value. The pref value @@ -402,11 +498,13 @@ class _RFPHelper { let logPrefix = `_roundContentSize[${Math.random()}]`; log(logPrefix); let win = aBrowser.ownerGlobal; + let browserContainer = aBrowser .getTabBrowser() .getBrowserContainer(aBrowser); let browserParent = aBrowser.parentElement; browserParent.classList.remove("exclude-letterboxing"); + let [ [contentWidth, contentHeight], [parentWidth, parentHeight], @@ -419,6 +517,27 @@ class _RFPHelper { ]) ); + if ( + !win._rfpSizeOffset || + (win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height) + ) { + const BASELINE_ROUNDING = 10; + const offset = s => + s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + + win._rfpSizeOffset = { + width: offset(parentWidth), + height: offset(parentHeight), + }; + log( + `${logPrefix} Window size offsets %o (from %s, %s)`, + win._rfpSizeOffset, + parentWidth, + parentHeight + ); + } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -437,6 +556,16 @@ class _RFPHelper { }); let result; + + if (!this.letterboxingEnabled) { + const offset = win._rfpSizeOffset; + result = r(aWidth - offset.width, aHeight - offset.height); + log( + `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` + ); + return result; + } + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. @@ -554,7 +683,6 @@ class _RFPHelper { _updateSizeForTabsInWindow(aWindow) { let tabBrowser = aWindow.gBrowser; - tabBrowser.tabpanels?.classList.add("letterboxing"); for (let tab of tabBrowser.tabs) { @@ -564,10 +692,18 @@ class _RFPHelper { // we need to add this class late because otherwise new windows get maximized aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); + if (!aWindow._rfpOriginalSize) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } }); } _attachWindow(aWindow) { + aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); const resizeObserver = (aWindow._rfpResizeObserver = new aWindow.ResizeObserver( @@ -585,19 +721,7 @@ class _RFPHelper { this._updateSizeForTabsInWindow(aWindow); } - _attachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._attachWindow(win); - } - } _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; @@ -614,20 +738,7 @@ class _RFPHelper { let browser = tab.linkedBrowser; this._resetContentSize(browser); } - } - - _detachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._detachWindow(win); - } + aWindow.removeEventListener("sizemodechange", windowResizeHandler); } _handleDOMWindowOpened(win) { ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -54,19 +54,12 @@ var torbutton_new_circuit; m_tb_prefs.addObserver("extensions.torbutton", this); m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this); m_tb_prefs.addObserver("javascript", this); - m_tb_prefs.addObserver("privacy.resistFingerprinting", this); - m_tb_prefs.addObserver("privacy.resistFingerprinting.letterboxing", this); }, unregister() { m_tb_prefs.removeObserver("extensions.torbutton", this); m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); m_tb_prefs.removeObserver("javascript", this); - m_tb_prefs.removeObserver("privacy.resistFingerprinting", this); - m_tb_prefs.removeObserver( - "privacy.resistFingerprinting.letterboxing", - this - ); }, // topic: what event occurred @@ -83,10 +76,6 @@ var torbutton_new_circuit; case "extensions.torbutton.use_nontor_proxy": torbutton_use_nontor_proxy(); break; - case "privacy.resistFingerprinting": - case "privacy.resistFingerprinting.letterboxing": - torbutton_update_fingerprinting_prefs(); - break; } }, }; @@ -666,21 +655,6 @@ var torbutton_new_circuit; Services.prefs.savePrefFile(null); } - function torbutton_update_fingerprinting_prefs() { - var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); - var letterboxing = m_tb_prefs.getBoolPref( - "privacy.resistFingerprinting.letterboxing", - false - ); - m_tb_prefs.setBoolPref( - "extensions.torbutton.resize_new_windows", - mode && !letterboxing - ); - - // Force prefs to be synced to disk - Services.prefs.savePrefFile(null); - } - // Bug 1506 P1: This function just cleans up prefs that got set badly in previous releases function torbutton_fixup_old_prefs() { if (m_tb_prefs.getIntPref("extensions.torbutton.pref_fixup_version") < 1) { @@ -728,9 +702,6 @@ var torbutton_new_circuit; // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup(); - // For charsets - torbutton_update_fingerprinting_prefs(); - // Bug 30565: sync browser.privatebrowsing.autostart with security.nocertdb torbutton_update_disk_prefs(); @@ -741,46 +712,6 @@ var torbutton_new_circuit; } } - // Bug 1506 P3: Used to decide if we should resize the window. - // - // Returns true if the window wind is neither maximized, full screen, - // ratpoisioned/evilwmed, nor minimized. - function torbutton_is_windowed(wind) { - torbutton_log( - 3, - "Window: (" + - wind.outerWidth + - "," + - wind.outerHeight + - ") ?= (" + - wind.screen.availWidth + - "," + - wind.screen.availHeight + - ")" - ); - if ( - wind.windowState == Ci.nsIDOMChromeWindow.STATE_MINIMIZED || - wind.windowState == Ci.nsIDOMChromeWindow.STATE_MAXIMIZED - ) { - torbutton_log(2, "Window is minimized/maximized"); - return false; - } - if ("fullScreen" in wind && wind.fullScreen) { - torbutton_log(2, "Window is fullScreen"); - return false; - } - if ( - wind.outerHeight == wind.screen.availHeight && - wind.outerWidth == wind.screen.availWidth - ) { - torbutton_log(3, "Window is ratpoisoned/evilwm'ed"); - return false; - } - - torbutton_log(2, "Window is normal"); - return true; - } - // Bug 1506 P3: This is needed pretty much only for the window resizing. // See comments for individual functions for details function torbutton_new_window(event) { @@ -797,17 +728,6 @@ var torbutton_new_circuit; } torbutton_do_startup(); - - let progress = Cc["@mozilla.org/docloaderservice;1"].getService( - Ci.nsIWebProgress - ); - - if (torbutton_is_windowed(window)) { - progress.addProgressListener( - torbutton_resizelistener, - Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT - ); - } } // Bug 1506 P2: This is only needed because we have observers @@ -815,8 +735,6 @@ var torbutton_new_circuit; function torbutton_close_window(event) { torbutton_tor_check_observer.unregister(); - window.removeEventListener("sizemodechange", m_tb_resize_handler); - // TODO: This is a real ghetto hack.. When the original window // closes, we need to find another window to handle observing // unique events... The right way to do this is to move the @@ -856,158 +774,4 @@ var torbutton_new_circuit; window.addEventListener("load", torbutton_new_window); window.addEventListener("unload", torbutton_close_window); - - var m_tb_resize_handler = null; - var m_tb_resize_date = null; - - // Bug 1506 P1/P3: Setting a fixed window size is important, but - // probably not for android. - var torbutton_resizelistener = { - QueryInterface: ChromeUtils.generateQI([ - "nsIWebProgressListener", - "nsISupportsWeakReference", - ]), - - onLocationChange(aProgress, aRequest, aURI) {}, - onStateChange(aProgress, aRequest, aFlag, aStatus) { - if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { - window.promiseDocumentFlushed(() => { - // Here we're guaranteed to read the "final" (!) initial size, rather than [1, 1]. - torbutton_resizelistener.originalSize = { - width: window.outerWidth, - height: window.outerHeight, - }; - }); - m_tb_resize_handler = async function() { - // Wait for end of execution queue to ensure we have correct windowState. - await new Promise(resolve => setTimeout(resolve, 0)); - if ( - window.windowState === window.STATE_MAXIMIZED || - window.windowState === window.STATE_FULLSCREEN - ) { - const kRemainingWarnings = - "extensions.torbutton.maximize_warnings_remaining"; - if ( - Services.prefs.getBoolPref( - "extensions.torbutton.resize_new_windows" - ) && - Services.prefs.getIntPref(kRemainingWarnings) > 0 - ) { - // Do not add another notification if one is already showing. - const kNotificationName = "torbutton-maximize-notification"; - - const box = gNotificationBox; - if (box.getNotificationWithValue(kNotificationName)) { - return; - } - - // Rate-limit showing our notification if needed. - if (m_tb_resize_date === null) { - m_tb_resize_date = Date.now(); - } else { - // We wait at least another second before we show a new - // notification. Should be enough to rule out OSes that call our - // handler rapidly due to internal workings. - if (Date.now() - m_tb_resize_date < 1000) { - return; - } - // Resizing but we need to reset |m_tb_resize_date| now. - m_tb_resize_date = Date.now(); - } - - // No need to get "OK" translated again. - const bundle = Services.strings.createBundle( - "chrome://global/locale/commonDialogs.properties" - ); - - const decreaseWarningsCount = () => { - const currentCount = Services.prefs.getIntPref( - kRemainingWarnings - ); - if (currentCount > 0) { - Services.prefs.setIntPref( - kRemainingWarnings, - currentCount - 1 - ); - } - }; - - let buttons = [ - { - label: bundle.GetStringFromName("OK"), - accessKey: "O", - popup: null, - callback() { - // reset notification timer to work-around resize race conditions - m_tb_resize_date = Date.now(); - // restore the original (rounded) size we had stored on window startup - let { originalSize } = torbutton_resizelistener; - window.resizeTo(originalSize.width, originalSize.height); - }, - }, - ]; - - const label = torbutton_get_property_string( - "torbutton.maximize_warning" - ); - - box.appendNotification( - kNotificationName, - { - label, - priority: box.PRIORITY_WARNING_LOW, - eventCallback(event) { - if (event === "dismissed") { - // user manually dismissed the notification - decreaseWarningsCount(); - } - }, - }, - buttons - ); - } - } - }; // m_tb_resize_handler - - // We need to handle OSes that auto-maximize windows depending on user - // settings and/or screen resolution in the start-up phase and users that - // try to shoot themselves in the foot by maximizing the window manually. - // We add a listener which is triggerred as soon as the window gets - // maximized (windowState = 1). We are resizing during start-up but not - // later as the user should see only a warning there as a stopgap before - // #14229 lands. - // Alas, the Firefox window code is handling the event not itself: - // "// Note the current implementation of SetSizeMode just stores - // // the new state; it doesn't actually resize. So here we store - // // the state and pass the event on to the OS." - // (See: https://mxr.mozilla.org/mozilla-esr31/source/xpfe/appshell/src/ - // nsWebShellWindow.cpp#348) - // This means we have to cope with race conditions and resizing in the - // sizemodechange listener is likely to fail. Thus, we add a specific - // resize listener that is doing the work for us. It seems (at least on - // Ubuntu) to be the case that maximizing (and then again normalizing) of - // the window triggers more than one resize event the first being not the - // one we need. Thus we can't remove the listener after the first resize - // event got fired. Thus, we have the rather klunky setTimeout() call. - window.addEventListener("sizemodechange", m_tb_resize_handler); - - let progress = Cc["@mozilla.org/docloaderservice;1"].getService( - Ci.nsIWebProgress - ); - progress.removeProgressListener(this); - } - }, // onStateChange - - onProgressChange( - aProgress, - aRequest, - curSelfProgress, - maxSelfProgress, - curTotalProgress, - maxTotalProgress - ) {}, - onStatusChange(aProgress, aRequest, stat, message) {}, - onSecurityChange() {}, - }; })(); -//vim:set ts=4 ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -115,6 +115,3 @@ torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It # Preferences for mobile: these strings are still referenced, but we should # check whether this feature is still used torbutton.security_settings.menu.title = Security Settings - -# Other legacy stuff we might just remove since we are using letterbox -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1b352… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1b352… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40833: Set update-channel for base-browser nightly
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4f6e8b75 by Nicolas Vigier at 2023-03-29T11:32:16+02:00 Bug 40833: Set update-channel for base-browser nightly - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -169,7 +169,7 @@ export LANG=C.UTF-8 ./mach configure \ --with-distribution-id=org.torproject \ --with-base-browser-version=[% c("var/torbrowser_version") %] \ - [% IF c("var/tor-browser") -%] + [% IF c("var/updater_enabled") -%] --enable-update-channel=[% c("var/channel") %] \ [% END %] \ [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40830: The fontconfig directory is missing in Base Browser
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 07f09f39 by Pier Angelo Vendrame at 2023-03-29T09:37:33+02:00 Bug 40830: The fontconfig directory is missing in Base Browser - - - - - 2 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/build Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -338,7 +338,7 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} [% END -%] # Set up custom bundled fonts. See fonts-conf(5). -export FONTCONFIG_PATH="${HOME}/[% c('var/ProjectName') %]/Data/fontconfig" +export FONTCONFIG_PATH="${HOME}/fontconfig" export FONTCONFIG_FILE="fonts.conf" # Avoid overwriting user's dconf values. Fixes #27903. ===================================== projects/browser/build ===================================== @@ -219,6 +219,10 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz for tbdir in "${TBDIRS[@]}" do + [% IF c("var/linux") -%] + mv Bundle-Data/linux/Data/fontconfig "$tbdir/" + [% END -%] + mkdir -p "$tbdir/$DOCSPATH" cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH" [% IF c("var/tor-browser") -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 40458: Implement .tor.onion aliases
by Pier Angelo Vendrame (＠pierov) 28 Mar '23

28 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c1b352e3 by Henry Wilkes at 2023-03-28T12:01:14+01:00 fixup! Bug 40458: Implement .tor.onion aliases - - - - - 1 changed file: - browser/components/onionservices/OnionAliasStore.jsm Changes: ===================================== browser/components/onionservices/OnionAliasStore.jsm ===================================== @@ -183,7 +183,7 @@ class Channel { } _makeMappings(rules) { - const toTest = /http[s]?:\/\/[a-zA-Z0-9\.]{56}.onion/; + const toTest = /^https?:\/\/[a-zA-Z0-9\.]{56}\.onion$/; const mappings = []; rules.rulesets.forEach(rule => { if (rule.rule.length != 1) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b352e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b352e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40826: Correctly set appname_marfile while signing basebrowser nightly
by Richard Pospesel (＠richard) 28 Mar '23

28 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ad634955 by Nicolas Vigier at 2023-03-28T08:28:12+02:00 Bug 40826: Correctly set appname_marfile while signing basebrowser nightly - - - - - 3 changed files: - tools/signing/nightly/config.yml - tools/signing/nightly/sign-nightly - tools/signing/nightly/update-responses-base-config.yml Changes: ===================================== tools/signing/nightly/config.yml ===================================== @@ -11,6 +11,7 @@ torbrowser: - nightly-windows-i686 - nightly-macos nss_db_dir: nssdb + appname_marfile: tor-browser basebrowser: publish_dirs: - basebrowser-nightly-linux-x86_64 @@ -19,6 +20,7 @@ basebrowser: - basebrowser-nightly-windows-i686 - basebrowser-nightly-macos nss_db_dir: nssdb-basebrowser-1 + appname_marfile: base-browser nss_certname: nightly-marsigner gpg_keyring: keyring/torbrowser-nightly.gpg rsync_dest: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-updates/ ===================================== tools/signing/nightly/sign-nightly ===================================== @@ -244,6 +244,7 @@ sub update_responses { my $ur_config = LoadFile("$FindBin::Bin/update-responses-base-config.yml"); $ur_config->{download}{mars_url} .= "/$publish_dir"; $ur_config->{releases_dir} = "$topdir/nightly/$publish_dir"; + $ur_config->{appname_marfile} = get_config('appname_marfile'); $ur_config->{channels}->{nightly} = $version; $ur_config->{versions}->{$version} = $ur_config->{versions}->{nightly_version}; my $buildinfos = get_buildinfos("$topdir/nightly/$publish_dir/$version/build-infos.json"); ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -1,7 +1,6 @@ --- download: mars_url: https://nightlies.tbb.torproject.org/nightly-updates -appname_marfile: tor-browser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40828: Use archive.debian.org mirror for jessie
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 916d3f45 by Nicolas Vigier at 2023-03-27T17:13:06+00:00 Bug 40828: Use archive.debian.org mirror for jessie - - - - - 1 changed file: - projects/mmdebstrap-image/config Changes: ===================================== projects/mmdebstrap-image/config ===================================== @@ -47,9 +47,8 @@ targets: suite: jessie arch: amd64 debian_mirror: > - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie-updates main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://security.debian.org/debian-security jessie/updates main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian/ jessie main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian-security/ jessie/updates main" bullseye-amd64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40828: Use archive.debian.org mirror for jessie
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8ea251b1 by Nicolas Vigier at 2023-03-27T16:46:58+02:00 Bug 40828: Use archive.debian.org mirror for jessie - - - - - 1 changed file: - projects/mmdebstrap-image/config Changes: ===================================== projects/mmdebstrap-image/config ===================================== @@ -47,9 +47,8 @@ targets: suite: jessie arch: amd64 debian_mirror: > - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie-updates main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://security.debian.org/debian-security jessie/updates main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian/ jessie main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian-security/ jessie/updates main" bullseye-amd64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted branch main-s131
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel deleted branch main-s131 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch main-s131
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed new branch main-s131 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mai… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d2179847 by Richard Pospesel at 2023-03-27T09:59:36+00:00 Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel - - - - - 7 changed files: - projects/browser/build - projects/release/dmg2mar - projects/release/update_responses_config.yml - rbm.conf - tools/dmg2mar - tools/marsigning_check.sh - tools/update-responses/update_responses Changes: ===================================== projects/browser/build ===================================== @@ -345,7 +345,7 @@ cd $distdir [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] MAR=$MARTOOLS/mar \ MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ - MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \ + MAR_CHANNEL_ID=[% c("var/mar_channel_id") %] \ $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] ===================================== projects/release/dmg2mar ===================================== @@ -5,4 +5,4 @@ cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]' export TOR_APPNAME_DMGFILE='[% c("var/ProjectName") -%]' export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]' -[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %] +[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/mar_channel_id") %] ===================================== projects/release/update_responses_config.yml ===================================== @@ -31,6 +31,7 @@ versions: [% IF c("var/create_unsigned_incrementals") -%] releases_dir: [% path(c('output_dir')) %]/unsigned [% END -%] + mar_channel_id: [% c('var/mar_channel_id') %] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %] incremental_from: ===================================== rbm.conf ===================================== @@ -77,6 +77,8 @@ var: - 12.5a3 updater_enabled: 1 build_mar: 1 + mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' + # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is ===================================== tools/dmg2mar ===================================== @@ -104,7 +104,7 @@ sub get_dmg_files_from_sha256sums { } sub convert_files { - my ($channel) = @_; + my ($mar_channel_id) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish( sub { @@ -149,7 +149,7 @@ sub convert_files { unlink $output; local $ENV{MOZ_PRODUCT_VERSION} = $file->{version}; - local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MAR_CHANNEL_ID} = $mar_channel_id; local $ENV{TMPDIR} = $tmpdir; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); @@ -178,9 +178,9 @@ sub remove_incremental_mars { $ENV{LC_ALL} = 'C'; -exit_error "Please specify update channel" unless @ARGV == 1; -my $channel = $ARGV[0]; +exit_error "Please specify the mar channel id" unless @ARGV == 1; +my $mar_channel_id = $ARGV[0]; extract_martools; -convert_files $channel; +convert_files $mar_channel_id; remove_incremental_mars; ===================================== tools/marsigning_check.sh ===================================== @@ -35,7 +35,7 @@ # 2) Let LD_LIBRARY_PATH point to the mar-tools directory # 3) Let NSS_DB_DIR point to the directory containing the database with the # signing certificate to check against. -# 4) Let CHANNEL be the expected update channel +# 4) Let MAR_CHANNEL_ID be the expected update channel (eg: torbrowser-torproject-alpha) # # To create the database to use for signature checking import the # release*.der certificate of your choice found in @@ -45,9 +45,9 @@ # certutil -d nssdb -N --empty-password # certutil -A -n "marsigner" -t,, -d nssdb -i /path/to/.der # -# 4) Change into the directory containing the MAR files and the +# 5) Change into the directory containing the MAR files and the # sha256sums-unsigned-build.txt/sha256sums-unsigned-build.incrementals.txt. -# 5) Run /path/to/marsigning_check.sh +# 6) Run /path/to/marsigning_check.sh if [ -z "$SIGNMAR" ] then @@ -67,9 +67,9 @@ then exit 1 fi -if [ -z "$CHANNEL" ] +if [ -z "$MAR_CHANNEL_ID" ] then - echo "The update channel is missing! ([nightly|alpha|release])" + echo "The update channel is missing! (torbrowser-torproject-[nightly|alpha|release])" exit 1 fi @@ -106,7 +106,7 @@ for f in *.mar; do fi # Test 1.5: Is the MAR file correctly signed by the correct channel key? - if [ ! "$($SIGNMAR -T "$f" | grep "MAR channel name")" = " - MAR channel name: torbrowser-torproject-${CHANNEL}" ]; then + if [ ! "$($SIGNMAR -T "$f" | grep "MAR channel name")" = " - MAR channel name: ${MAR_CHANNEL_ID}" ]; then echo "$f contains wrong update channel!" fi ===================================== tools/update-responses/update_responses ===================================== @@ -264,7 +264,7 @@ sub create_incremental_mar { } } local $ENV{MOZ_PRODUCT_VERSION} = $new_version; - local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MAR_CHANNEL_ID} = get_config($config, $new_version, $os, 'mar_channel_id'); local $ENV{TMPDIR} = $tmpdir; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40824: dmg2mar script using hardcoded project names for paths
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6ca5fba3 by Richard Pospesel at 2023-03-24T12:46:19+00:00 Bug 40824: dmg2mar script using hardcoded project names for paths - - - - - 1 changed file: - projects/release/dmg2mar Changes: ===================================== projects/release/dmg2mar ===================================== @@ -1,4 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] + +export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]' +export TOR_APPNAME_DMGFILE='[% c("var/ProjectName") -%]' +export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]' [% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted branch main-s131
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel deleted branch main-s131 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch main-s131
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel pushed new branch main-s131 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mai… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c9fa59f3 by Richard Pospesel at 2023-03-24T10:52:36+00:00 Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -1,18 +1,18 @@ --- tmp_dir: '[% c("tmp_dir") %]' create_downloads_json: 1 -appname_marfile: tor-browser -appname_bundle_android: tor-browser -appname_bundle_macos: TorBrowser -appname_bundle_linux: tor-browser -appname_bundle_win32: torbrowser-install -appname_bundle_win64: torbrowser-install-win64 +appname_marfile: '[% c("var/project-name") %]' +appname_bundle_android: '[% c("var/project-name") %]' +appname_bundle_macos: '[% c("var/ProjectName") %]' +appname_bundle_linux: '[% c("var/project-name") %]' +appname_bundle_win32: '[% c("var/projectname") %]-install' +appname_bundle_win64: '[% c("var/projectname") %]-install-win64' releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] download: - archive_url: https://archive.torproject.org/tor-package-archive/torbrowser + archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]' gpg_keyring: ../../keyring/torbrowser.gpg - bundles_url: https://dist.torproject.org/torbrowser - mars_url: https://cdn.torproject.org/aus1/torbrowser + bundles_url: 'https://dist.torproject.org/[% c("var/projectname") %]' + mars_url: 'https://cdn.torproject.org/aus1/[% c("var/projectname") %]' build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -61,6 +61,8 @@ versions: minSupportedInstructionSet: SSE2 mar_compression: xz tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' + +[% IF c("var/tor-browser") -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory @@ -75,3 +77,4 @@ htaccess_rewrite_rules: RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] +[% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ea93a41f by Pier Angelo Vendrame at 2023-03-22T15:22:35+00:00 fixup! Firefox preference overrides. Bug 41689: Do not customize startup.homepage_override_url in Base Browser. (cherry picked from commit eff20896dedc966b4162bfa098a6dc065faf30eb) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Set a generic, default URL that will be opened in a tab after an update. -// Typically, this will not be used; instead, the <update> element within -// each update manifest should contain attributes similar to: -// actions="showURL" -// openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); - // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea93a41… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea93a41… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: eff20896 by Pier Angelo Vendrame at 2023-03-22T15:40:02+01:00 fixup! Firefox preference overrides. Bug 41689: Do not customize startup.homepage_override_url in Base Browser. - - - - - 2af5abfc by Pier Angelo Vendrame at 2023-03-22T15:42:49+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41689: Move the generic updated URL to the right place - - - - - 4 changed files: - browser/app/profile/001-base-profile.js - browser/branding/tb-alpha/pref/firefox-branding.js - browser/branding/tb-nightly/pref/firefox-branding.js - browser/branding/tb-release/pref/firefox-branding.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Set a generic, default URL that will be opened in a tab after an update. -// Typically, this will not be used; instead, the <update> element within -// each update manifest should contain attributes similar to: -// actions="showURL" -// openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); - // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and ===================================== browser/branding/tb-alpha/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OL…"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 43200); // 12 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation ===================================== browser/branding/tb-nightly/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OL…"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 14400); // 4 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation ===================================== browser/branding/tb-release/pref/firefox-branding.js ===================================== @@ -4,7 +4,12 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", ""); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // Interval: Time between checks for a new version (in seconds) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cbc864… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cbc864… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 12.5a4
by Richard Pospesel (＠richard) 22 Mar '23

22 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: e5f6f59b by Richard Pospesel at 2023-03-22T13:20:14+00:00 alpha: new version, 12.5a4 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a2-12.5a3-linux32-ALL.xml - − update_3/alpha/12.5a2-12.5a3-linux64-ALL.xml - − update_3/alpha/12.5a2-12.5a3-win32-ALL.xml - − update_3/alpha/12.5a2-12.5a3-win64-ALL.xml - + update_3/alpha/12.5a3-12.5a4-linux32-ALL.xml - + update_3/alpha/12.5a3-12.5a4-linux64-ALL.xml - + update_3/alpha/12.5a3-12.5a4-macos-ALL.xml - + update_3/alpha/12.5a3-12.5a4-win32-ALL.xml - + update_3/alpha/12.5a3-12.5a4-win64-ALL.xml - − update_3/alpha/12.5a3-linux32-ALL.xml - − update_3/alpha/12.5a3-linux64-ALL.xml - − update_3/alpha/12.5a3-macos-ALL.xml - − update_3/alpha/12.5a3-win32-ALL.xml - − update_3/alpha/12.5a3-win64-ALL.xml - + update_3/alpha/12.5a4-linux32-ALL.xml - + update_3/alpha/12.5a4-linux64-ALL.xml - + update_3/alpha/12.5a4-macos-ALL.xml - + update_3/alpha/12.5a4-win32-ALL.xml - + update_3/alpha/12.5a4-win64-ALL.xml - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json - update_3/alpha/downloads.json Changes: ===================================== update_3/alpha/.htaccess ===================================== @@ -2,26 +2,28 @@ RewriteEngine On # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] -RewriteRule ^[^/]+/12.5a3/ no-update.xml [last] -RewriteRule ^Linux_x86-gcc3/12.5a2/ALL 12.5a2-12.5a3-linux32-ALL.xml [last] -RewriteRule ^Linux_x86-gcc3/[^/]+/ALL 12.5a3-linux32-ALL.xml [last] -RewriteRule ^Linux_x86-gcc3/ 12.5a3-linux32-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/12.5a2/ALL 12.5a2-12.5a3-linux64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 12.5a3-linux64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 12.5a3-linux64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 12.5a3-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 12.5a3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 12.5a3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 12.5a3-macos-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/12.5a2/ALL 12.5a2-12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/[^/]+/ALL 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/ 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/12.5a2/ALL 12.5a2-12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/[^/]+/ALL 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/ 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/12.5a2/ALL 12.5a2-12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/[^/]+/ALL 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/ 12.5a3-win32-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/12.5a2/ALL 12.5a2-12.5a3-win64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 12.5a3-win64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 12.5a3-win64-ALL.xml [last] +RewriteRule ^[^/]+/12.5a4/ no-update.xml [last] +RewriteRule ^Linux_x86-gcc3/12.5a3/ALL 12.5a3-12.5a4-linux32-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/[^/]+/ALL 12.5a4-linux32-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/ 12.5a4-linux32-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/12.5a3/ALL 12.5a3-12.5a4-linux64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 12.5a4-linux64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 12.5a4-linux64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/12.5a3/ALL 12.5a3-12.5a4-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 12.5a4-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 12.5a4-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/12.5a3/ALL 12.5a3-12.5a4-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 12.5a4-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 12.5a4-macos-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/12.5a3/ALL 12.5a3-12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/[^/]+/ALL 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/ 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/12.5a3/ALL 12.5a3-12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/[^/]+/ALL 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/ 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/12.5a3/ALL 12.5a3-12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/[^/]+/ALL 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/ 12.5a4-win32-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/12.5a3/ALL 12.5a3-12.5a4-win64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 12.5a4-win64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 12.5a4-win64-ALL.xml [last] ===================================== update_3/alpha/12.5a2-12.5a3-linux32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="580cdfa145074f6b5eca0d7002bb7f2c44ee581106d2838490d0cac3f70f17ab94b3385a4a774c7a3e489380959e380cc9903611db41525add63e1673a6c6822" size="122593840" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="70a1ac8b4e03982c369f272cb7190641c61d5e71319b61d3090f2ad01bfc1ecd05139ea8e094df682f840cb3a29a324546d8fced8d7e6061d3cff1bef47b5748" size="23840413" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a2-12.5a3-linux64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="4af525f87db2d6cbae43d9f344286b52e3c3a176d50f977ba3e4c06eafa90bb01f3938763f3d91adb1c58b3cd1f1567cf31b182b79b22e1f9e54447c381898ee" size="122410728" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="1ab4b9683d3b0a671d46ebaff0227b2e3ee9627ae30ebc0b8879c149184e9ac8e25307162fc10f47902e8bff715d9c7da2b47c75d0b5168d835671fa35f9ed71" size="23988674" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a2-12.5a3-win32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win32-12.5a3_…" hashFunction="SHA512" hashValue="6b2edafbb49dcca8fe62cb32096555118246bd774779e6be4a998bd92a5ee7537fa746cb09671b0dcac0446fc5255efecae8433bc7d885efceb20af7d00a5d7a" size="103586915" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win32-12.5a2-…" hashFunction="SHA512" hashValue="98fb9c50f32841fec34c91f34e555d380b307325910a75c9dba424e805a267662cc6f1054a9f2eae30f9950bf7f8231772db506e2380e9ac41f26ae57b1d0a22" size="18725857" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a2-12.5a3-win64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win64-12.5a3_…" hashFunction="SHA512" hashValue="73aad14acb2f925698ad5cb1a5073308843b06a0eb885de2044a3b72a5db9c8a7690fb29a7701210f6a66af65eca07f3b164a8d4d023f3c3e94dc51ddf4f9640" size="104127113" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win64-12.5a2-…" hashFunction="SHA512" hashValue="fd7d3cc3058544ae9de71552ab24cd09d58c50c5296434de6dd8db9eec7fc4b8ebe576ec20d634d3f433d991d14176a21c59cb5bfdd47c2ba6f5e399b6af8b4d" size="17777907" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-12.5a4-linux32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="00472c540023f20874b06f8b3f06b2d8e680294c4dd78ae7eb4c5ac434492aa91082b045d2374959a6631e1a47773496daff5b322f3c8b086f8121c53b51e00b" size="123208864" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="7597973c3ad3e194bdd538b6f6d191866a33ecc275aade52a52bd98b163c8e21178ab63a52e7a193e3e36a4e34cb08d5d219ce7e06cd2a8b27ca1fb6f3a0ddd8" size="9309312" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-12.5a4-linux64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="3ccfc13ea75071760cc42c7916eecc8d96820ee6ef58c61d34ad25c8954bfde5f6db233cb9a5a94e596ffeffdf49feafc0260b3cffce503a38748a623d85bcff" size="122890752" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="254166704d31c226ed27a453fe0c2a372b2f5950fed63ddd41ad793393f0c895c181890e8eb327b8e5586648f9d52806c64b21c070955023c290ab902df5c695" size="8835449" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-12.5a4-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-macos-12.5a4_…" hashFunction="SHA512" hashValue="c040323872eb619b7766d9ca1c3afc4a858602a08ae47d8d16ff824d6cfa09fafb67c173c482ac602f2c83f89360de008619b82a260206a26ab7e179416edb33" size="158961876" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-macos-12.5a3-…" hashFunction="SHA512" hashValue="93ca02fc44446304109f4788d9a25e2f00960d168f66f583a193237e91f07b5241fee2cfddc5c0c368205f0c34a16b651e3b710b4cdafeb98e851eddef75fcb5" size="34948171" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-12.5a4-win32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win32-12.5a4_…" hashFunction="SHA512" hashValue="4ed704019203163cdc65c03973853bffe9bb432a245d251eb3b35ba203fb228d63cbf4fa4118ce6bb8de57a7b8843e92563a2888ec2a852b0f125b16671f7a61" size="104452067" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win32-12.5a3-…" hashFunction="SHA512" hashValue="87f89f7ae563f394a8120287ea94fe7b35b8b47ee33569ea06e4f69cacb926ee92d4c063eef23a272c7426f3248ed21e736a45074750406e8970698eddcd440e" size="10152881" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-12.5a4-win64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win64-12.5a4_…" hashFunction="SHA512" hashValue="c4989824555aaaefa562303d731111af90988db8cf3c3a4c46a75887b033ad1682f7543ba25d40d1b7fecf1712bfd6a118767cd09cfebb8c67a88e550c75d889" size="104865457" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win64-12.5a3-…" hashFunction="SHA512" hashValue="6dada80a50da907643ec30fdd6c786f2b09a59ee75bc5c4e8e11822c6f9fc83e0cf46d746b7cc07efc29d9f75889ad11edcaed65585cf792836e27b3060a9291" size="9288607" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a3-linux32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="580cdfa145074f6b5eca0d7002bb7f2c44ee581106d2838490d0cac3f70f17ab94b3385a4a774c7a3e489380959e380cc9903611db41525add63e1673a6c6822" size="122593840" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a3-linux64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="4af525f87db2d6cbae43d9f344286b52e3c3a176d50f977ba3e4c06eafa90bb01f3938763f3d91adb1c58b3cd1f1567cf31b182b79b22e1f9e54447c381898ee" size="122410728" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a3-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-macos-12.5a3_…" hashFunction="SHA512" hashValue="317661cba5fe955ed6cb3e5081124371f1354fc28f965cc3093c9ea90757b6af99b7bc9e70d3c0c6a7bc5c8801c244c30b2a44a6dbd3335d0c79c89a3fda5477" size="158215916" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a3-win32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win32-12.5a3_…" hashFunction="SHA512" hashValue="6b2edafbb49dcca8fe62cb32096555118246bd774779e6be4a998bd92a5ee7537fa746cb09671b0dcac0446fc5255efecae8433bc7d885efceb20af7d00a5d7a" size="103586915" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a3-win64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a3" appVersion="12.5a3" platformVersion="102.8.0" buildID="20230706040101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a3" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a3/tor-browser-win64-12.5a3_…" hashFunction="SHA512" hashValue="73aad14acb2f925698ad5cb1a5073308843b06a0eb885de2044a3b72a5db9c8a7690fb29a7701210f6a66af65eca07f3b164a8d4d023f3c3e94dc51ddf4f9640" size="104127113" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a4-linux32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="00472c540023f20874b06f8b3f06b2d8e680294c4dd78ae7eb4c5ac434492aa91082b045d2374959a6631e1a47773496daff5b322f3c8b086f8121c53b51e00b" size="123208864" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a4-linux64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="3ccfc13ea75071760cc42c7916eecc8d96820ee6ef58c61d34ad25c8954bfde5f6db233cb9a5a94e596ffeffdf49feafc0260b3cffce503a38748a623d85bcff" size="122890752" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a4-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-macos-12.5a4_…" hashFunction="SHA512" hashValue="c040323872eb619b7766d9ca1c3afc4a858602a08ae47d8d16ff824d6cfa09fafb67c173c482ac602f2c83f89360de008619b82a260206a26ab7e179416edb33" size="158961876" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a4-win32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win32-12.5a4_…" hashFunction="SHA512" hashValue="4ed704019203163cdc65c03973853bffe9bb432a245d251eb3b35ba203fb228d63cbf4fa4118ce6bb8de57a7b8843e92563a2888ec2a852b0f125b16671f7a61" size="104452067" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a4-win64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a4" appVersion="12.5a4" platformVersion="102.9.0" buildID="20230706050101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a4" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a4/tor-browser-win64-12.5a4_…" hashFunction="SHA512" hashValue="c4989824555aaaefa562303d731111af90988db8cf3c3a4c46a75887b033ad1682f7543ba25d40d1b7fecf1712bfd6a118767cd09cfebb8c67a88e550c75d889" size="104865457" type="complete"></patch></update></updates> ===================================== update_3/alpha/download-android-aarch64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-aa…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-aa…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-aa…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-aa…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-android-armv7.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-ar…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-ar…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-ar…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-ar…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-android-x86.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-x8…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-x8…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-x8…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-x8…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-android-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-x8…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-12.5a3-android-x8…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-x8…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-12.5a4-android-x8…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-linux-i686.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux32-12.5a3_AL…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux32-12.5a3_AL…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux32-12.5a4_AL…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux32-12.5a4_AL…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux64-12.5a3_AL…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux64-12.5a3_AL…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux64-12.5a4_AL…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux64-12.5a4_AL…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/TorBrowser-12.5a3-macos_ALL.d…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/TorBrowser-12.5a3-macos_ALL.d…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/TorBrowser-12.5a4-macos_ALL.d…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/TorBrowser-12.5a4-macos_ALL.d…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-windows-i686.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-12.5a3_ALL…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-12.5a3_ALL…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-12.5a4_ALL…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-12.5a4_ALL…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-win64-12.5…","git_tag":"tbb-12.5a3-build1","sig":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-win64-12.5…","version":"12.5a3"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-win64-12.5…","git_tag":"tbb-12.5a4-build1","sig":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-win64-12.5…","version":"12.5a4"} \ No newline at end of file ===================================== update_3/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux32-12.5a3_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux32-12.5a3_AL…"}},"linux64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux64-12.5a3_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a3/tor-browser-linux64-12.5a3_AL…"}},"macos":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a3/TorBrowser-12.5a3-macos_ALL.d…","sig":"https://dist.torproject.org/torbrowser/12.5a3/TorBrowser-12.5a3-macos_ALL.d…"}},"win32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-12.5a3_ALL…","sig":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-12.5a3_ALL…"}},"win64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-win64-12.5…","sig":"https://dist.torproject.org/torbrowser/12.5a3/torbrowser-install-win64-12.5…"}}},"tag":"tbb-12.5a3-build1","version":"12.5a3"} \ No newline at end of file +{"downloads":{"linux32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux32-12.5a4_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux32-12.5a4_AL…"}},"linux64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux64-12.5a4_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a4/tor-browser-linux64-12.5a4_AL…"}},"macos":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a4/TorBrowser-12.5a4-macos_ALL.d…","sig":"https://dist.torproject.org/torbrowser/12.5a4/TorBrowser-12.5a4-macos_ALL.d…"}},"win32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-12.5a4_ALL…","sig":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-12.5a4_ALL…"}},"win64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-win64-12.5…","sig":"https://dist.torproject.org/torbrowser/12.5a4/torbrowser-install-win64-12.5…"}}},"tag":"tbb-12.5a4-build1","version":"12.5a4"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1194690e by Pier Angelo Vendrame at 2023-03-22T14:19:38+01:00 fixup! Base Browser's .mozconfigs. Bug 41684: Fix Android mozconfigs for local dev builds - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -38,6 +38,7 @@ ac_add_options MOZ_TELEMETRY_REPORTING= if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default + ac_add_options --with-base-browser-version=dev-build else # We only use beta GeckoView for now, for official builds ac_add_options --enable-update-channel=beta ===================================== mozconfig-android-all ===================================== @@ -10,6 +10,7 @@ if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --without-wasm-sandboxed-libraries + ac_add_options --with-base-browser-version=dev-build else # We want to have a similar fat .aar versioning as Mozilla and make it clear # we are on the beta channel for GeckoView View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1194690… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1194690… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 3 commits: fixup! TB3: Tor Browser's official .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c13ad2e8 by Pier Angelo Vendrame at 2023-03-22T14:18:11+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41684: Fix Android mozconfigs for local dev builds - - - - - 23624ebe by Pier Angelo Vendrame at 2023-03-22T14:18:12+01:00 fixup! Base Browser's .mozconfigs. Bug 41684: Fix Android mozconfigs for local dev builds - - - - - cbc8642f by Pier Angelo Vendrame at 2023-03-22T14:18:12+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41684: Fix Android mozconfigs for local dev builds The shell script matched x86 with x86_64. I do not know how to match an entire token in shell scripts, so I switched to a Python script, instead. - - - - - 6 changed files: - browser/config/mozconfigs/base-browser-android - browser/config/mozconfigs/tor-browser-android - mozconfig-android-all - tools/torbrowser/Makefile - + tools/torbrowser/fataar.py - − tools/torbrowser/fataar.sh Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -38,6 +38,7 @@ ac_add_options MOZ_TELEMETRY_REPORTING= if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default + ac_add_options --with-base-browser-version=dev-build else # We only use beta GeckoView for now, for official builds ac_add_options --enable-update-channel=beta ===================================== browser/config/mozconfigs/tor-browser-android ===================================== @@ -1,7 +1,3 @@ . $topsrcdir/browser/config/mozconfigs/base-browser-android mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" - -if test ! -z "$LOCAL_DEV_BUILD"; then - ac_add_options --with-tor-browser-version=dev-build -fi ===================================== mozconfig-android-all ===================================== @@ -10,7 +10,7 @@ if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --without-wasm-sandboxed-libraries - ac_add_options --with-tor-browser-version=dev-build + ac_add_options --with-base-browser-version=dev-build else # We want to have a similar fat .aar versioning as Mozilla and make it clear # we are on the beta channel for GeckoView ===================================== tools/torbrowser/Makefile ===================================== @@ -29,7 +29,7 @@ deploy: ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) fat-aar: - ./fataar.sh $(DEV_ROOT) $(ARCHS) + ./fataar.py $(DEV_ROOT) $(ARCHS) all: build deploy ===================================== tools/torbrowser/fataar.py ===================================== @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 +import os +import re +import subprocess +import sys + + +dev_root = sys.argv[1] +archs_in = re.split("\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] +archs_out = [] +env = dict(os.environ) + +env["MOZCONFIG"] = "mozconfig-android-all" +if "armv7" in archs_in: + env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( + dev_root + + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" + ) + archs_out.append("armeabi-v7a") +if "aarch64" in archs_in: + env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( + dev_root + + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" + ) + archs_out.append("arm64-v8a") +if "x86" in archs_in or "i686" in archs_in: + env["MOZ_ANDROID_FAT_AAR_X86"] = ( + dev_root + + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" + ) + archs_out.append("x86") +if "x86_64" in archs_in or "x86-64" in archs_in: + env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( + dev_root + + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" + ) + archs_out.append("x86_64") +env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) + +if not archs_out: + print( + "The architectures have not specified or are not valid.", + file=sys.stderr, + ) + print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) + print( + "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", + file=sys.stderr, + ) + sys.exit(1) + +subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) +subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/torbrowser/fataar.sh deleted ===================================== @@ -1,34 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCHS=$2 - -cd $DEV_ROOT - -glue="" -if [[ "$ARCHS" == *"armv7"* ]]; then - export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$DEV_ROOT/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar - glue="$glue,armeabi-v7a" -fi -if [[ "$ARCHS" == *"aarch64"* ]]; then - export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$DEV_ROOT/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar - glue="$glue,arm64-v8a" -fi -if [[ "$ARCHS" == *"x86"* ]]; then - export MOZ_ANDROID_FAT_AAR_X86=$DEV_ROOT/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar - glue="$glue,x86" -fi -if [[ "$ARCHS" == *"x86_64"* ]]; then - export MOZ_ANDROID_FAT_AAR_X86_64=$DEV_ROOT/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar - glue="$glue,x86_64" -fi -if [ -z "$glue" ]; then - echo "The architectures have not specified or are not valid." - echo "Usage: make fat-aar ARCHS=\"\$archs\"" - echo "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space." - exit 1 -fi -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=${glue:1} - -MOZCONFIG=mozconfig-android-all ./mach configure -MOZCONFIG=mozconfig-android-all ./mach build View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2a2e87… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2a2e87… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e7da6e7c by Pier Angelo Vendrame at 2023-03-22T11:23:57+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 40788: Tor Browser is phoning home The hijack-list component is the only remaining one calling home. This is a temporary workaround, to use the remote settings. We should do something like this commit at a more generic level, for all RemoteSettings users. (cherry picked from commit 2a2e87c3dbc2a98a9ff6387dd278cb2643323b6d) - - - - - 1 changed file: - toolkit/modules/IgnoreLists.jsm Changes: ===================================== toolkit/modules/IgnoreLists.jsm ===================================== @@ -8,19 +8,19 @@ const { XPCOMUtils } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { - RemoteSettings: "resource://services-settings/remote-settings.js", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm", }); -var EXPORTED_SYMBOLS = ["IgnoreLists"]; +Cu.importGlobalProperties(["fetch"]); -const SETTINGS_IGNORELIST_KEY = "hijack-blocklists"; +var EXPORTED_SYMBOLS = ["IgnoreLists"]; class IgnoreListsManager { + _ignoreListSettings = null; + async init() { - if (!this._ignoreListSettings) { - this._ignoreListSettings = RemoteSettings(SETTINGS_IGNORELIST_KEY); - } + // TODO: Restore the initialization, once we use only the local dumps for + // the remote settings. } async getAndSubscribe(listener) { @@ -30,7 +30,7 @@ class IgnoreListsManager { const settings = await this._getIgnoreList(); // Listen for future updates after we first get the values. - this._ignoreListSettings.on("sync", listener); + this._ignoreListSettings?.on("sync", listener); return settings; } @@ -70,6 +70,14 @@ class IgnoreListsManager { * could be obtained. */ async _getIgnoreListSettings(firstTime = true) { + if (!this._ignoreListSettings) { + const dump = await fetch( + "resource:///defaults/settings/main/hijack-blocklists.json" + ); + const { data } = await dump.json(); + return data; + } + let result = []; try { result = await this._ignoreListSettings.get({ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e7da6e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e7da6e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0