- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 2 commits: fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 27 Feb '25

27 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: e21ae62e by Henry Wilkes at 2025-02-27T12:24:45+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43469: Change the quickstart checkbox to a toggle. We also update the description text to use "connect automatically" rather than "Quickstart". - - - - - 10c9315c by Henry Wilkes at 2025-02-27T12:24:45+00:00 fixup! Tor Browser strings TB 43469: Use "Connect automatically" instead of "Quickstart" in the UI. - - - - - 4 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/torPreferences.css - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2486,18 +2486,18 @@ const gConnectionPane = (function () { const retval = { // cached frequently accessed DOM elements - _enableQuickstartCheckbox: null, + _enableQuickstartToggle: null, // populate xul with strings and cache the relevant elements _populateXUL() { // Quickstart - this._enableQuickstartCheckbox = document.getElementById( - "torPreferences-quickstart-toggle" + this._enableQuickstartToggle = document.getElementById( + "tor-connection-quickstart-toggle" ); - this._enableQuickstartCheckbox.addEventListener("command", () => { - TorConnect.quickstart = this._enableQuickstartCheckbox.checked; + this._enableQuickstartToggle.addEventListener("toggle", () => { + TorConnect.quickstart = this._enableQuickstartToggle.pressed; }); - this._enableQuickstartCheckbox.checked = TorConnect.quickstart; + this._enableQuickstartToggle.pressed = TorConnect.quickstart; Services.obs.addObserver(this, TorConnectTopics.QuickstartChange); // Location @@ -2643,7 +2643,7 @@ const gConnectionPane = (function () { observe(subject, topic) { switch (topic) { case TorConnectTopics.QuickstartChange: { - this._enableQuickstartCheckbox.checked = TorConnect.quickstart; + this._enableQuickstartToggle.pressed = TorConnect.quickstart; break; } // triggered when tor connect state changes and we may ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -69,16 +69,19 @@  <groupbox data-category="paneConnection" hidden="true"> <label> - <html:h2 data-l10n-id="tor-connection-quickstart-heading"></html:h2> + <html:h2 data-l10n-id="tor-connection-automatic-heading"></html:h2> </label> <description class="description-deemphasized" flex="1" - data-l10n-id="tor-connection-quickstart-description" + data-l10n-id="tor-connection-automatic-description" /> - <checkbox - id="torPreferences-quickstart-toggle" + <html:moz-toggle + id="tor-connection-quickstart-toggle" + class="tor-toggle" + label-align-after="" data-l10n-id="tor-connection-quickstart-checkbox" + data-l10n-attrs="label" /> </groupbox> @@ -141,6 +144,7 @@ </hbox> <html:moz-toggle id="tor-bridges-enabled-toggle" + class="tor-toggle" label-align-after="" data-l10n-id="tor-bridges-use-bridges" data-l10n-attrs="label" ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -34,6 +34,11 @@ button.spoof-button-disabled { } } +.tor-toggle { + margin-block: 16px; + width: max-content; +} + /* Status */ #network-status-internet-area { @@ -201,11 +206,6 @@ button.spoof-button-disabled { display: none; } -#tor-bridges-enabled-toggle { - margin-block: 16px; - width: max-content; -} - #tor-bridges-update-area { /* Still accessible to screen reader, but not visual. */ position: absolute; ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -56,9 +56,8 @@ tor-connection-settings-category = # -brand-short-name refers to 'Tor Browser', localized. tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world. tor-connection-browser-learn-more-link = Learn more -tor-connection-quickstart-heading = Quickstart -# -brand-short-name refers to 'Tor Browser', localized. -tor-connection-quickstart-description = Quickstart connects { -brand-short-name } to the Tor Network automatically when launched, based on your last used connection settings. +tor-connection-automatic-heading = Connect automatically +tor-connection-automatic-description = Automatically connect to the Tor network at launch using your current connection settings. tor-connection-quickstart-checkbox = .label = Always connect automatically View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/85e00b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/85e00b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.7.0esr-14.5-1] 3 commits: fixup! BB 32308: Use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 27 Feb '25

27 Feb '25

Pier Angelo Vendrame pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: c7cc05f5 by Pier Angelo Vendrame at 2025-02-27T10:35:32+01:00 fixup! BB 32308: Use direct browser sizing for letterboxing. When the dimension is less than 50px, we need to return dimension itself, rather than a 0px margin. - - - - - 7a9352a7 by Pier Angelo Vendrame at 2025-02-27T10:35:35+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 43205: Fix newwin rounding. RFP might produce bad rounding because of platform-specific bugs. Solving them might involve a refactor that is out of our capacity, therefore we add a JS patch to fix wrong sizes. - - - - - c2980c01 by Pier Angelo Vendrame at 2025-02-27T10:35:35+01:00 fixup! BB 41918: Option to reuse last window size when letterboxing is enabled. BB 43205: Fix newwin rounding. Do not fix sizes when remember last size is enabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import * as constants from "resource://gre/modules/RFPTargetConstants.sys.mjs"; const kPrefResistFingerprinting = "privacy.resistFingerprinting"; @@ -21,6 +22,8 @@ const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; const kPrefLetterboxingDidForceSize = "privacy.resistFingerprinting.letterboxing.didForceSize"; +const kPrefLetterboxingRememberSize = + "privacy.resistFingerprinting.letterboxing.rememberSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -519,22 +522,23 @@ class _RFPHelper { } } + stepping(aDimension, aIsWidth) { + if (aDimension <= 500) { + return 50; + } else if (aDimension <= 1600) { + return aIsWidth ? 200 : 100; + } + return 200; + } + /** * Given a width or height, rounds it with the proper stepping. */ steppedSize(aDimension, aIsWidth = false) { - let stepping; if (aDimension <= 50) { - return 0; - } else if (aDimension <= 500) { - stepping = 50; - } else if (aDimension <= 1600) { - stepping = aIsWidth ? 200 : 100; - } else { - stepping = 200; + return aDimension; } - - return aDimension - (aDimension % stepping); + return aDimension - (aDimension % this.stepping(aDimension, aIsWidth)); } /** @@ -806,6 +810,7 @@ class _RFPHelper { } _attachWindow(aWindow) { + this._fixRounding(aWindow); aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.shrinkToLetterbox = this.shrinkToLetterbox; aWindow.addEventListener("dblclick", this._onWindowDoubleClick); @@ -865,6 +870,52 @@ class _RFPHelper { ); } + _fixRounding(aWindow) { + if ( + !this.rfpEnabled || + Services.prefs.getBoolPref(kPrefLetterboxingRememberSize, false) + ) { + return; + } + + // tor-browser#43205: in case of subpixels, new windows might have a wrong + // size because of platform-specific bugs (e.g., Bug 1947439 on Windows). + const contentContainer = aWindow.document.getElementById("browser"); + const rect = contentContainer.getBoundingClientRect(); + const steppingWidth = this.stepping(rect.width, true); + const steppingHeight = this.stepping(rect.height, false); + const deltaWidth = + rect.width - steppingWidth * Math.round(rect.width / steppingWidth); + const deltaHeight = + rect.height - steppingHeight * Math.round(rect.height / steppingHeight); + + // It seems that under X11, a window cannot have all the possible (integer) + // sizes (see the videos on tor-browser#43205 and Bug 1947439)... + // We observed this behavior with 1.25 scaling, but we could not find + // where it happens exactly, so this code might be wrong. + // On the same system, this problem does not happen with Wayland. + if (AppConstants.platform === "linux") { + let targetWidth = aWindow.outerWidth - deltaWidth; + let targetHeight = aWindow.outerHeight - deltaHeight; + const x11Size = s => + Math.floor( + // This first rounding is done by Gecko, rather than X11. + Math.round(s * aWindow.devicePixelRatio) / aWindow.devicePixelRatio + ); + const x11Width = x11Size(targetWidth); + const x11Height = x11Size(targetHeight); + if (x11Width < targetWidth) { + targetWidth = x11Width + 2; + } + if (x11Height < targetHeight) { + targetHeight = x11Height + 2; + } + aWindow.resizeTo(targetWidth, targetHeight); + } else { + aWindow.resizeBy(deltaWidth, deltaHeight); + } + } + getTargets() { return constants.Targets; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20e649… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20e649… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] 3 commits: fixup! BB 32308: Use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 27 Feb '25

27 Feb '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 602d2c43 by Pier Angelo Vendrame at 2025-02-27T10:35:07+01:00 fixup! BB 32308: Use direct browser sizing for letterboxing. When the dimension is less than 50px, we need to return dimension itself, rather than a 0px margin. - - - - - 535e2267 by Pier Angelo Vendrame at 2025-02-27T10:35:09+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 43205: Fix newwin rounding. RFP might produce bad rounding because of platform-specific bugs. Solving them might involve a refactor that is out of our capacity, therefore we add a JS patch to fix wrong sizes. - - - - - 46d99e57 by Pier Angelo Vendrame at 2025-02-27T10:35:09+01:00 fixup! BB 41918: Option to reuse last window size when letterboxing is enabled. BB 43205: Fix newwin rounding. Do not fix sizes when remember last size is enabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import * as constants from "resource://gre/modules/RFPTargetConstants.sys.mjs"; const kPrefResistFingerprinting = "privacy.resistFingerprinting"; @@ -21,6 +22,8 @@ const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; const kPrefLetterboxingDidForceSize = "privacy.resistFingerprinting.letterboxing.didForceSize"; +const kPrefLetterboxingRememberSize = + "privacy.resistFingerprinting.letterboxing.rememberSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -519,22 +522,23 @@ class _RFPHelper { } } + stepping(aDimension, aIsWidth) { + if (aDimension <= 500) { + return 50; + } else if (aDimension <= 1600) { + return aIsWidth ? 200 : 100; + } + return 200; + } + /** * Given a width or height, rounds it with the proper stepping. */ steppedSize(aDimension, aIsWidth = false) { - let stepping; if (aDimension <= 50) { - return 0; - } else if (aDimension <= 500) { - stepping = 50; - } else if (aDimension <= 1600) { - stepping = aIsWidth ? 200 : 100; - } else { - stepping = 200; + return aDimension; } - - return aDimension - (aDimension % stepping); + return aDimension - (aDimension % this.stepping(aDimension, aIsWidth)); } /** @@ -806,6 +810,7 @@ class _RFPHelper { } _attachWindow(aWindow) { + this._fixRounding(aWindow); aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.shrinkToLetterbox = this.shrinkToLetterbox; aWindow.addEventListener("dblclick", this._onWindowDoubleClick); @@ -865,6 +870,52 @@ class _RFPHelper { ); } + _fixRounding(aWindow) { + if ( + !this.rfpEnabled || + Services.prefs.getBoolPref(kPrefLetterboxingRememberSize, false) + ) { + return; + } + + // tor-browser#43205: in case of subpixels, new windows might have a wrong + // size because of platform-specific bugs (e.g., Bug 1947439 on Windows). + const contentContainer = aWindow.document.getElementById("browser"); + const rect = contentContainer.getBoundingClientRect(); + const steppingWidth = this.stepping(rect.width, true); + const steppingHeight = this.stepping(rect.height, false); + const deltaWidth = + rect.width - steppingWidth * Math.round(rect.width / steppingWidth); + const deltaHeight = + rect.height - steppingHeight * Math.round(rect.height / steppingHeight); + + // It seems that under X11, a window cannot have all the possible (integer) + // sizes (see the videos on tor-browser#43205 and Bug 1947439)... + // We observed this behavior with 1.25 scaling, but we could not find + // where it happens exactly, so this code might be wrong. + // On the same system, this problem does not happen with Wayland. + if (AppConstants.platform === "linux") { + let targetWidth = aWindow.outerWidth - deltaWidth; + let targetHeight = aWindow.outerHeight - deltaHeight; + const x11Size = s => + Math.floor( + // This first rounding is done by Gecko, rather than X11. + Math.round(s * aWindow.devicePixelRatio) / aWindow.devicePixelRatio + ); + const x11Width = x11Size(targetWidth); + const x11Height = x11Size(targetHeight); + if (x11Width < targetWidth) { + targetWidth = x11Width + 2; + } + if (x11Height < targetHeight) { + targetHeight = x11Height + 2; + } + aWindow.resizeTo(targetWidth, targetHeight); + } else { + aWindow.resizeBy(deltaWidth, deltaHeight); + } + } + getTargets() { return constants.Targets; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/21… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/21… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 3 commits: fixup! BB 32308: Use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 27 Feb '25

27 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 231eebe7 by Pier Angelo Vendrame at 2025-02-27T10:28:06+01:00 fixup! BB 32308: Use direct browser sizing for letterboxing. When the dimension is less than 50px, we need to return dimension itself, rather than a 0px margin. - - - - - 410e75f5 by Pier Angelo Vendrame at 2025-02-27T10:28:12+01:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 43205: Fix newwin rounding. RFP might produce bad rounding because of platform-specific bugs. Solving them might involve a refactor that is out of our capacity, therefore we add a JS patch to fix wrong sizes. - - - - - 85e00bd3 by Pier Angelo Vendrame at 2025-02-27T10:28:13+01:00 fixup! BB 41918: Option to reuse last window size when letterboxing is enabled. BB 43205: Fix newwin rounding. Do not fix sizes when remember last size is enabled. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import * as constants from "resource://gre/modules/RFPTargetConstants.sys.mjs"; const kPrefResistFingerprinting = "privacy.resistFingerprinting"; @@ -21,6 +22,8 @@ const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; const kPrefLetterboxingDidForceSize = "privacy.resistFingerprinting.letterboxing.didForceSize"; +const kPrefLetterboxingRememberSize = + "privacy.resistFingerprinting.letterboxing.rememberSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -519,22 +522,23 @@ class _RFPHelper { } } + stepping(aDimension, aIsWidth) { + if (aDimension <= 500) { + return 50; + } else if (aDimension <= 1600) { + return aIsWidth ? 200 : 100; + } + return 200; + } + /** * Given a width or height, rounds it with the proper stepping. */ steppedSize(aDimension, aIsWidth = false) { - let stepping; if (aDimension <= 50) { - return 0; - } else if (aDimension <= 500) { - stepping = 50; - } else if (aDimension <= 1600) { - stepping = aIsWidth ? 200 : 100; - } else { - stepping = 200; + return aDimension; } - - return aDimension - (aDimension % stepping); + return aDimension - (aDimension % this.stepping(aDimension, aIsWidth)); } /** @@ -806,6 +810,7 @@ class _RFPHelper { } _attachWindow(aWindow) { + this._fixRounding(aWindow); aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.shrinkToLetterbox = this.shrinkToLetterbox; aWindow.addEventListener("dblclick", this._onWindowDoubleClick); @@ -865,6 +870,52 @@ class _RFPHelper { ); } + _fixRounding(aWindow) { + if ( + !this.rfpEnabled || + Services.prefs.getBoolPref(kPrefLetterboxingRememberSize, false) + ) { + return; + } + + // tor-browser#43205: in case of subpixels, new windows might have a wrong + // size because of platform-specific bugs (e.g., Bug 1947439 on Windows). + const contentContainer = aWindow.document.getElementById("browser"); + const rect = contentContainer.getBoundingClientRect(); + const steppingWidth = this.stepping(rect.width, true); + const steppingHeight = this.stepping(rect.height, false); + const deltaWidth = + rect.width - steppingWidth * Math.round(rect.width / steppingWidth); + const deltaHeight = + rect.height - steppingHeight * Math.round(rect.height / steppingHeight); + + // It seems that under X11, a window cannot have all the possible (integer) + // sizes (see the videos on tor-browser#43205 and Bug 1947439)... + // We observed this behavior with 1.25 scaling, but we could not find + // where it happens exactly, so this code might be wrong. + // On the same system, this problem does not happen with Wayland. + if (AppConstants.platform === "linux") { + let targetWidth = aWindow.outerWidth - deltaWidth; + let targetHeight = aWindow.outerHeight - deltaHeight; + const x11Size = s => + Math.floor( + // This first rounding is done by Gecko, rather than X11. + Math.round(s * aWindow.devicePixelRatio) / aWindow.devicePixelRatio + ); + const x11Width = x11Size(targetWidth); + const x11Height = x11Size(targetHeight); + if (x11Width < targetWidth) { + targetWidth = x11Width + 2; + } + if (x11Height < targetHeight) { + targetHeight = x11Height + 2; + } + aWindow.resizeTo(targetWidth, targetHeight); + } else { + aWindow.resizeBy(deltaWidth, deltaHeight); + } + } + getTargets() { return constants.Targets; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/797f4e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/797f4e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] TBB 41382: Replace gitlab templates ReleasePrep label references with...
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 936a656b by hackademix at 2025-02-27T08:58:33+00:00 TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -40,7 +40,7 @@ - [ ] **Other**: please explain ### Issue Tracking -- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Uplifting - [ ] Patchset is a candidate for uplift to upstream projects (e.g. mingw, clang, etc) 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][tor-browser-128.7.0esr-14.5-1] 2 commits: fixup! TB 41649: Create rebase and security backport gitlab issue templates
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: fec501a5 by hackademix at 2025-02-27T08:57:38+00:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 797f4ecd by hackademix at 2025-02-27T08:57:38+00:00 fixup! Adding issue and merge request templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 5 changed files: - .gitlab/issue_templates/Backport Android Security Fixes.md - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Legacy.md - .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Rebase.md Changes: ===================================== .gitlab/issue_templates/Backport Android Security Fixes.md ===================================== @@ -18,7 +18,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issues (stable and alpha). +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issues (stable and alpha). ### **Security Vulnerabilities Report**: https://www.mozilla.org/en-US/security/advisories/ ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -27,7 +27,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Legacy.md ===================================== @@ -21,7 +21,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -25,7 +25,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/merge_request_templates/Rebase.md ===================================== @@ -10,7 +10,7 @@ - tor-browser-build#xxxxx ### Issue Tracking -- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Review View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8db5a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8db5a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] fixup! Adding issue and merge request templates
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 210e0efb by hackademix at 2025-02-26T23:36:38+01:00 fixup! Adding issue and merge request templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 3 changed files: - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Rebase.md Changes: ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -29,7 +29,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -29,7 +29,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/merge_request_templates/Rebase.md ===================================== @@ -10,7 +10,7 @@ - tor-browser-build#xxxxx ### Issue Tracking -- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Review View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/210… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/210… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41379: Bundle some Moat settings with the browser.
by Pier Angelo Vendrame (＠pierov) 27 Feb '25

27 Feb '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 50eeb222 by Pier Angelo Vendrame at 2025-02-27T08:39:38+01:00 Bug 41379: Bundle some Moat settings with the browser. - - - - - 6 changed files: - projects/browser/build - projects/browser/build.android - projects/browser/config - + projects/moat-settings/README.md - + projects/moat-settings/build - + projects/moat-settings/config Changes: ===================================== projects/browser/build ===================================== @@ -125,6 +125,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b rm "$TBDIR/$TORBINPATH/tor-gencert.exe" [% END %] + tar -xf [% c('input_files_by_name/moat-settings') %] [% END -%] for tbdir in "${TBDIRS[@]}" @@ -258,11 +259,11 @@ do tbdir="$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/" [% IF c("var/tor-browser") -%] pushd "$rootdir" - pt_config_dir=chrome/toolkit/content/global - mkdir -p "$pt_config_dir" - cp "pt_config.json" "$pt_config_dir/" - [% c("touch") %] "$pt_config_dir/pt_config.json" - zip -Xm "$tbdir/omni.ja" "$pt_config_dir/pt_config.json" + config_dir=chrome/toolkit/content/global + mkdir -p "$config_dir" + cp moat_countries.json pt_config.json "$config_dir/" + [% c("touch") %] "$config_dir/"*.json + zip -Xm "$tbdir/omni.ja" "$config_dir/moat_countries.json" "$config_dir/pt_config.json" rm -rf chrome popd [% END -%] ===================================== projects/browser/build.android ===================================== @@ -26,7 +26,8 @@ unzip $rootdir/[% c('input_files_by_name/noscript') %] popd [%IF c("var/tor-browser") -%] - tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json + tar -xaf "$rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json + tar -xf "$rootdir/[% c('input_files_by_name/moat-settings') %]" [% END -%] # This function generates a signed APK from a given APK file. @@ -56,8 +57,8 @@ function generate_apk { mkdir omni pushd omni unzip ../omni.ja - [%IF c("var/tor-browser") -%] - cp -an ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json + [% IF c("var/tor-browser") -%] + cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/ [% END -%] [% c('zip', { zip_src => [ '.' ], @@ -68,7 +69,7 @@ function generate_apk { mkdir apk pushd apk 7zz x "$apk" - cp -Rn ../assets ./ + cp -R ../assets ./ find -type f -exec touch -m -t '[% USE date; date.format(pc("geckoview", "timestamp"), format = "%Y%m%d%H%M") %]' {} \; find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt 7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt ===================================== projects/browser/config ===================================== @@ -103,6 +103,9 @@ input_files: enable: '[% c("var/macos_universal") && c("var/tor-browser") %]' target_replace: '^torbrowser-macos.*': torbrowser-macos-aarch64 + - project: moat-settings + name: moat-settings + enable: '[% c("var/tor-browser") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' ===================================== projects/moat-settings/README.md ===================================== @@ -0,0 +1,2 @@ +We use this project to fetch the Moat circumvention data to make sure we have it +even before running non-Tor requests on the browser. ===================================== projects/moat-settings/build ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] + +tar -xf [% project %]-[% c("version") %].tar.[% c('compress_tar') %] [% project %]-[% c("version") %]/conf/circumvention.json +jq -c keys [% project %]-[% c("version") %]/conf/circumvention.json > moat_countries.json + +[% c("touch") %] moat_countries.json +[% c('tar', { + tar_src => 'moat_countries.json', + tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/moat-settings/config ===================================== @@ -0,0 +1,7 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' +git_url: https://gitlab.torproject.org/tpo/anti-censorship/rdsys-admin.git +git_hash: 810fb24bd5fe36c8c0a67ecf8f8ec47b479eee31 +version: '[% c("abbrev") %]' +# Use gz for now, since we do not support Zstandard on Linux containers. +compress_tar: 'gz' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! [android] Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 27 Feb '25

27 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8db5a552 by clairehurst at 2025-02-27T01:14:52+00:00 fixup! [android] Implement Android-native Connection Assist UI This should have been included with the following. Bug 43359: Improper handling of TorBootstrapChangeListener with respect to system onDestroy() calls for HomeActivity - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -452,10 +452,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn components.notificationsDelegate.bindToActivity(this) - val engine = components.core.engine - if (engine is GeckoEngine) { - val torIntegration = engine.getTorIntegrationController() - torIntegration.registerBootstrapStateChangeListener(this) + if (settings().useHtmlConnectionUi) { + val engine = components.core.engine + if (engine is GeckoEngine) { + val torIntegration = engine.getTorIntegrationController() + torIntegration.registerBootstrapStateChangeListener(this) + } } StartupTimeline.onActivityCreateEndHome(this) // DO NOT MOVE ANYTHING BELOW HERE. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8db5a55… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8db5a55… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41381: More flexible tagging script.
by ma1 (＠ma1) 26 Feb '25

26 Feb '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 15ee5d47 by hackademix at 2025-02-26T19:31:28+01:00 Bug 41381: More flexible tagging script. - - - - - 2 changed files: - tools/browser/README.md - tools/browser/sign-tag Changes: ===================================== tools/browser/README.md ===================================== @@ -37,11 +37,11 @@ This script gpg signs a git tag associated with a particular browser commit in t #### Prerequisites -- The user must create the following soft-links: +- The user may create the following soft-links (by default they are automatically pointed to ../../git_clones/firefox): - `/tools/browser/basebrowser` -> `/path/to/local/tor-browser.git` - `/tools/browser/mullvadbrowser` -> `/path/to/local/mullvad-browser.git` - `/tools/browser/torbrowser` -> `/path/to/local/tor-browser.git` -- The user must first checkout the relevant branch of the commit we are tagging +- The user must first checkout the relevant branch (local or remote-tracking) of the commit we are tagging - This is needed to extract the ESR version, branch-number, and browser name #### Usage @@ -93,4 +93,4 @@ Invoke the relevant soft-link'd version of this script to sign a particular brow Tag commit 385aa0559a90 in mullvad-browser-128.4.0esr-14.0-1 tag: mullvad-browser-128.4.0esr-14.0-1-build2 message: Tagging build2 for 128.4.0esr-based stable - ``` \ No newline at end of file + ``` ===================================== tools/browser/sign-tag ===================================== @@ -18,7 +18,9 @@ browser=$(echo "$script_name" | perl -pe 's/^[^\.]+\.//') case "${browser}" in basebrowser | torbrowser | mullvadbrowser) # go down to browser directory - pushd ${script_dir}/${browser} > /dev/null + browser_dir="$script_dir/$browser" + [ -e "$browser_dir" ] || ln -s "../../git_clones/firefox" "$browser_dir" + pushd "$browser_dir" > /dev/null # and exit on script termination trap "popd > /dev/null" EXIT ;; @@ -33,7 +35,7 @@ esac # and message # -branch_name=$(git rev-parse --abbrev-ref HEAD) +branch_name=$(git log -n1 --oneline --decorate=short | grep -Eo '[a-z]+-browser-[1-9][0-9]+[^),]*-[1-9]' | head -n1) if [[ $branch_name =~ ^([a-z]+-browser)-([1-9][0-9]+\.[0-9]+)(\.[0-9]+esr|a[1-9][0-9]*)-([1-9][0-9]*\.[05])-([1-9]).*$ ]]; then project="${BASH_REMATCH[1]}" upstream="${BASH_REMATCH[2]}${BASH_REMATCH[3]}" @@ -77,8 +79,10 @@ commit=$(git rev-parse --short ${3:-HEAD}) # channel validation if [[ "${project}" == "mullvad-browser" ]]; then + repo="$project" valid_channels=("rapid" "alpha" "stable") else + repo="tor-browser" valid_channels=("rapid" "alpha" "stable" "legacy") fi channel_valid=false @@ -113,3 +117,9 @@ echo " tag: ${tag}" echo " message: ${message}" git tag -s "${tag}" "${commit}" -m "${message}" + +read -p "Do you want to push ${tag} to ${repo}.git? (y/N) " -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]]; then + git push "git@gitlab.torproject.org:tpo/applications/${repo}.git" "${tag}" +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0