- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! BB 40926: Implemented the New Identity feature
by brizental (＠brizental) 21 Aug '25

21 Aug '25

brizental pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 4b154152 by Beatriz Rizental at 2025-08-21T15:39:24+02:00 fixup! BB 40926: Implemented the New Identity feature - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -418,22 +418,21 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { tbl.onLocationChange = (...args) => { tbl.onLocationChange = onLocationChange; tbl.onLocationChange(...args); - let displayAddress; - try { - const url = new URL(homeURL); - displayAddress = url.hostname; - if (!displayAddress) { - // no host, use full address and truncate if too long - const MAX_LEN = 32; - displayAddress = url.href; - if (displayAddress.length > MAX_LEN) { - displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; - } - } - } catch (e) { + const url = URL.parse(homeURL); + if (!url) { // malformed URL, bail out return; } + + let displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } const callback = () => { Services.prefs.setStringPref(trustedHomePref, homeURL); win.BrowserHome(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4b15415… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4b15415… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41548: Unify CFLAGS definition for Android.
by Pier Angelo Vendrame (＠pierov) 21 Aug '25

21 Aug '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0508c07b by Pier Angelo Vendrame at 2025-08-21T15:17:58+02:00 Bug 41548: Unify CFLAGS definition for Android. Avoid repeating -Oz, instead use a variable from rbm.conf. - - - - - 00f0cf66 by Pier Angelo Vendrame at 2025-08-21T15:19:57+02:00 Bug 41548: Set tor's visibility to hidden on Android. This helps to reduce the size of the tor binary on Android by almost 1MB uncompressed and 370kB compressed on x86. Add also other interesting linking options. - - - - - 6 changed files: - projects/libevent/config - projects/openssl/config - projects/tor/config - projects/zlib/build - projects/zstd/build - rbm.conf Changes: ===================================== projects/libevent/config ===================================== @@ -17,7 +17,7 @@ targets: configure_opt_project: --disable-shared android: var: - configure_opt_project: --disable-shared CFLAGS="-Oz" + configure_opt_project: --disable-shared CFLAGS="[% c('var/CFLAGS') %]" input_files: - project: container-image ===================================== projects/openssl/config ===================================== @@ -26,7 +26,7 @@ targets: configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128' android: var: - configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] -Oz' + configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] [% c("var/CFLAGS") %]' input_files: - project: container-image ===================================== projects/tor/config ===================================== @@ -43,7 +43,7 @@ targets: android: var: - configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc CFLAGS=-Oz' + configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="-Wl,--icf=safe -Wl,--pack-dyn-relocs=relr -Wl,--exclude-libs,ALL"' input_files: - project: container-image ===================================== projects/zlib/build ===================================== @@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/android") -%] export CHOST=[% c("var/cross_prefix") %] export CC=[% c("var/CC") %] - export CFLAGS="-Oz" + export CFLAGS="[% c('var/CFLAGS') %]" ./configure --prefix=$distdir make -j[% c("num_procs") %] make -j[% c("num_procs") %] install ===================================== projects/zstd/build ===================================== @@ -8,7 +8,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta cd /var/tmp/build/[% project %]-[% c('version') %] export CPPFLAGS=-DZSTD_MULTITHREAD export CC=[% c("var/CC") %] -export CFLAGS="-Oz" +export CFLAGS="[% c('var/CFLAGS') %]" make -C lib -j[% c("num_procs") %] PREFIX=$distdir install # Only need static libraries rm $distdir/lib/libzstd.so* ===================================== rbm.conf ===================================== @@ -470,6 +470,7 @@ targets: compiler: android-toolchain android_min_api: 21 CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang' + CFLAGS: '-Oz -fvisibility=hidden' container: suite: bookworm arch: amd64 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 7 commits: fixup! BB 40926: Implemented the New Identity feature
by brizental (＠brizental) 21 Aug '25

21 Aug '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 40fe2123 by Beatriz Rizental at 2025-08-21T14:45:59+02:00 fixup! BB 40926: Implemented the New Identity feature - - - - - ca116af7 by Beatriz Rizental at 2025-08-21T14:45:59+02:00 fixup! TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - 61f37354 by Beatriz Rizental at 2025-08-21T14:46:00+02:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser - - - - - db2882b1 by Beatriz Rizental at 2025-08-21T14:46:00+02:00 fixup! TB 7494: Create local home page for TBB. - - - - - 2e686601 by Beatriz Rizental at 2025-08-21T14:46:00+02:00 fixup! TB 23247: Communicating security expectations for .onion - - - - - 3e500e35 by Beatriz Rizental at 2025-08-21T14:46:01+02:00 fixup! TB 21952: Implement Onion-Location - - - - - 1b623002 by Beatriz Rizental at 2025-08-21T14:46:01+02:00 fixup! TB 40458: Implement .tor.onion aliases - - - - - 9 changed files: - browser/base/content/pageinfo/security.js - browser/components/abouttor/content/aboutTor.js - browser/components/newidentity/content/newidentity.js - browser/components/onionservices/OnionAliasStore.sys.mjs - browser/components/onionservices/OnionLocationChild.sys.mjs - browser/components/onionservices/TorRequestWatch.sys.mjs - browser/components/rulesets/content/aboutRulesets.js - toolkit/components/torconnect/TorConnectChild.sys.mjs - toolkit/modules/DragDropFilter.sys.mjs Changes: ===================================== browser/base/content/pageinfo/security.js ===================================== @@ -57,15 +57,15 @@ var security = { (Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT | Ci.nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT); var isEV = ui.state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL; - let uriInformation = new URL(gDocInfo.documentURIObject.spec); + let uriInformation = URL.parse(gDocInfo.documentURIObject.spec); // If the Onion site could not be loaded, the view-source will be also be // about:neterror. - if (uriInformation.protocol == "view-source:") { - uriInformation = new URL(uriInformation.pathname); + if (uriInformation?.protocol == "view-source:") { + uriInformation = URL.parse(uriInformation.pathname); } const isOnion = - ["http:", "https:"].includes(uriInformation.protocol) && - uriInformation.hostname.endsWith(".onion"); + ["http:", "https:"].includes(uriInformation?.protocol) && + uriInformation?.hostname.endsWith(".onion"); let retval = { cAName: "", ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -298,10 +298,11 @@ const SurveyArea = { */ init() { document.getElementById("survey-launch").addEventListener("click", () => { - if (!this._localeData) { + const url = URL.parse(this._urlBase); + if (!url || !this._localeData) { return; } - const url = new URL(this._urlBase); + url.searchParams.append("lang", this._localeData.urlCode); open(url.href); }); ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -418,22 +418,21 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { tbl.onLocationChange = (...args) => { tbl.onLocationChange = onLocationChange; tbl.onLocationChange(...args); - let displayAddress; - try { - const url = new URL(homeURL); - displayAddress = url.hostname; - if (!displayAddress) { - // no host, use full address and truncate if too long - const MAX_LEN = 32; - displayAddress = url.href; - if (displayAddress.length > MAX_LEN) { - displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; - } - } - } catch (e) { + const url = URL.parse(homeURL); + if (!url) { // malformed URL, bail out return; } + + let displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } const callback = () => { Services.prefs.setStringPref(trustedHomePref, homeURL); win.BrowserHome(); ===================================== browser/components/onionservices/OnionAliasStore.sys.mjs ===================================== @@ -175,17 +175,15 @@ class Channel { ); return; } - let toHostname; - try { - const toUrl = new URL(rule.rule[0].to); - toHostname = toUrl.hostname; - } catch (err) { + const toHostname = URL.parse(rule.rule[0].to)?.hostname; + if (!toHostname) { log.error( - "Cannot detect the hostname from the to rule", - rule.rule[0].to, - err + "Unable to parse the URL and the hostname from the to rule", + rule.rule[0].to ); + return; } + let fromRe; try { fromRe = new RegExp(rule.rule[0].from); @@ -318,6 +316,7 @@ class _OnionAliasStore { throw Error("Name cannot be empty"); } + // This will throw if the URL is invalid. new URL(chanData.pathPrefix); const scope = new RegExp(chanData.scope); const ch = new Channel( ===================================== browser/components/onionservices/OnionLocationChild.sys.mjs ===================================== @@ -25,12 +25,12 @@ export class OnionLocationChild extends JSWindowActorChild { let onionLocationURI = doc.onionLocationURI; const refreshURI = docShell.QueryInterface(Ci.nsIRefreshURI); if (onionLocationURI && refreshURI) { - const docUrl = new URL(doc.URL); - let onionUrl = new URL(onionLocationURI.asciiSpec); + const docUrl = URL.parse(doc.URL); + let onionUrl = URL.parse(onionLocationURI.asciiSpec); // Keep consistent with Location - if (!onionUrl.hash && docUrl.hash) { + if (!onionUrl?.hash && docUrl?.hash) { onionUrl.hash = docUrl.hash; - onionLocationURI = Services.io.newURI(onionUrl.toString()); + onionLocationURI = Services.io.newURI(onionUrl?.toString() || ""); } refreshURI.refreshURI( onionLocationURI, ===================================== browser/components/onionservices/TorRequestWatch.sys.mjs ===================================== @@ -79,7 +79,14 @@ class RequestObserver { } isCrossOrigin(url1, url2) { - return new URL(url1).origin !== new URL(url2).origin; + const origin1 = URL.parse(url1)?.origin; + const origin2 = URL.parse(url2)?.origin; + + if (!origin1 || !origin2) { + return true; + } + + return origin1 !== origin2; } shouldBlindCrossOrigin(uri) { try { ===================================== browser/components/rulesets/content/aboutRulesets.js ===================================== @@ -210,8 +210,8 @@ class EditState { const pathPrefix = elements.pathPrefixInput.value.trim(); try { - const url = new URL(pathPrefix); - if (url.protocol !== "http:" && url.protocol !== "https:") { + const url = URL.parse(pathPrefix); + if (url?.protocol !== "http:" && url?.protocol !== "https:") { elements.pathPrefixInput.setCustomValidity( await document.l10n.formatValue("rulesets-details-path-input-invalid") ); ===================================== toolkit/components/torconnect/TorConnectChild.sys.mjs ===================================== @@ -30,20 +30,21 @@ export class TorConnectChild extends RemotePageChild { this.#redirected = true; const redirect = new URLSearchParams( - new URL(this.contentWindow.document.location.href).search + URL.parse(this.contentWindow.document.location.href)?.search ).get("redirect"); // Fallback in error cases: let replaceURI = "about:tor"; - try { - const url = new URL( - redirect - ? decodeURIComponent(redirect) - : // NOTE: We expect no redirect when address is entered manually, or - // about:torconnect is opened from preferences or urlbar. - // Go to the home page. - await this.sendQuery("torconnect:home-page") - ); + const url = URL.parse( + redirect + ? decodeURIComponent(redirect) + : // NOTE: We expect no redirect when address is entered manually, or + // about:torconnect is opened from preferences or urlbar. + // Go to the home page. + await this.sendQuery("torconnect:home-page") + ); + + if (url) { // Do not allow javascript URI. See tor-browser#41766 if ( ["about:", "file:", "https:", "http:"].includes(url.protocol) || @@ -55,8 +56,8 @@ export class TorConnectChild extends RemotePageChild { } else { console.error(`Scheme is not allowed "${redirect}"`); } - } catch (e) { - console.error(`Invalid redirect URL "${redirect}"`, e); + } else { + console.error(`Invalid redirect URL "${redirect}"`); } // Replace the destination to prevent "about:torconnect" entering the ===================================== toolkit/modules/DragDropFilter.sys.mjs ===================================== @@ -97,11 +97,7 @@ export const DragDropFilter = { const links = aDataTransfer.mozGetDataAt(urlType, i); // Skip DNS-safe URLs (no hostname, e.g. RFC 3966 tel:) const mayLeakDNS = links.split("\n").some(link => { - try { - return new URL(link).hostname; - } catch (e) { - return false; - } + return URL.parse(link)?.hostname ?? false; }); if (!mayLeakDNS) { continue; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c29f47… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c29f47… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41523: Use custom glean in geckoview
by brizental (＠brizental) 21 Aug '25

21 Aug '25

brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6100c67a by Beatriz Rizental at 2025-08-21T14:41:56+02:00 Bug 41523: Use custom glean in geckoview - - - - - 5 changed files: - Makefile - projects/geckoview/build_common - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/glean/config Changes: ===================================== Makefile ===================================== @@ -647,6 +647,9 @@ cargo_vendor-lox: submodule-update cargo_vendor-uniffi-rs: submodule-update $(rbm) build uniffi-rs --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 +cargo_vendor-glean: submodule-update + $(rbm) build glean --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 + go_vendor-conjure: submodule-update $(rbm) build conjure --step go_vendor --target alpha --target torbrowser-linux-x86_64 ===================================== projects/geckoview/build_common ===================================== @@ -14,6 +14,7 @@ export PATH="/var/tmp/dist/node/bin:$PATH" export LC_ALL=C.UTF-8 export LANG=C.UTF-8 +tar -xf [% c('input_files_by_name/glean') %] tar -xf [% c('input_files_by_name/application-services') %] export NIMBUS_FML=$rootdir/application-services/nimbus-fml @@ -34,6 +35,7 @@ export GRADLE_FLAGS="--no-daemon --offline -Dmaven.repo.local=$distdir/[% projec # standardized for reproducibility. mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo cp -rl $rootdir/application-services/maven/* $gradle_repo +cp -rl $rootdir/glean/maven/* $gradle_repo cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true cp -rl $gradle_repo/m2/* $gradle_repo || true cp -rl $gradle_repo/maven2/* $gradle_repo || true ===================================== projects/geckoview/config ===================================== @@ -37,7 +37,7 @@ var: - openjdk-17-jdk-headless # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 17 + gradle_dependencies_version: 18 gradle_version: 8.13 glean_parser: 14.0.1 # python/mozboot/mozboot/android.py @@ -77,6 +77,9 @@ steps: - project: application-services name: application-services pkg_type: build + - project: glean + name: glean + pkg_type: build - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' @@ -162,6 +165,9 @@ input_files: - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]' name: glean-wheels sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]' + - project: glean + name: glean + pkg_type: build - project: oss-licenses-plugin name: oss-licenses-plugin - name: tor-expert-bundle-aar ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== @@ -1023,12 +1023,6 @@ dba74d6bf94647ee397bf7afb2ab07f6fe8d13157e56785fa540a2a13ed82c99 | https://maven d36f248782d4ab513d2ab2b6141799525211c37ba0941c4aa2e73ee00f1a14b2 | https://maven.google.com/com/google/firebase/firebase-messaging/24.1.1/fire… d001eb0ccbbfc8cb9eaa193a358e63712974639775647be949ab232c2b29b407 | https://maven.google.com/com/google/testing/platform/core-proto/0.0.9-alpha… 3bb45280df1dd1c96b9a01724a614566b7d60d33453fcd52c2c741f9999c3a4e | https://maven.google.com/com/google/testing/platform/core-proto/0.0.9-alpha… -7d66a1b1e51592eda1e77c44d5692192dbffc828ea3899ff92ae0161b681a336 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -07742881a447c577669139ed7548fc4a0e6c43c63aa28a6f4652ff2d163b94f6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -79aa542e883553436721d40af661beb9ac09dad323b89afde057631c54fdf83c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/… -17ae368dcc12a965df8a9195e5d897fb70400159a87effcf65ee5c05790f814e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/… -cb1c7a04874d97c6bb1d3ba4ce009e1fde5f46225b45f6bb87559328573b530b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-6… -5792a08566c294a46ea777939819154a945eeee8d5cb47d391f845d7c711013a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-6… 243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92 | https://plugins.gradle.org/m2/com/almworks/sqlite4java/sqlite4java/1.0.392/… 139552c586a57bf6d98f87d6b7e23fef4db53cf74097be962f7868e3606c79d2 | https://plugins.gradle.org/m2/com/almworks/sqlite4java/sqlite4java/1.0.392/… 02a5b08a2b35d2d58eb2eaca9d84ac00fb341da725fdbd653ea3ed130437e95a | https://plugins.gradle.org/m2/com/caverock/androidsvg-aar/1.4/androidsvg-aa… ===================================== projects/glean/config ===================================== @@ -12,35 +12,37 @@ var: gradle_dependencies_version: 1 gradle_version: 8.13 -input_files: - - project: container-image - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - # These versions of build tools and platform are not the same version needed - # by our other projects, therefore we download it only here instead of modifying - # the android-toolchain project. - - URL: 'https://dl.google.com/android/repository/build-tools_r35_linux.zip' - name: build_tools_35 - sha256sum: bd3a4966912eb8b30ed0d00b0cda6b6543b949d5ffe00bea54c04c81e1561d88 - - URL: 'https://dl.google.com/android/repository/platform-35_r02.zip' - name: platform_35 - sha256sum: 0988cacad01b38a18a47bac14a0695f246bc76c1b06c0eeb8eb0dc825ab0c8e0 - - project: gradle - name: gradle - - project: rust - name: rust - - project: uniffi-rs - name: uniffi-rs - - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]' - name: glean-wheels - sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]' - - name: cargo_vendor - project: glean - pkg_type: cargo_vendor - norec: - sha256sum: 0cb6a7093b93ecc8d8e13f02e5ec46a538b5eaf55ab027b46754bfbdeec2152e - - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' - name: gradle-dependencies - exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - - filename: use-custom-gradle-repo.diff - - filename: use-uniffi-noop.diff +steps: + build: + input_files: + - project: container-image + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + # These versions of build tools and platform are not the same version needed + # by our other projects, therefore we download it only here instead of modifying + # the android-toolchain project. + - URL: 'https://dl.google.com/android/repository/build-tools_r35_linux.zip' + name: build_tools_35 + sha256sum: bd3a4966912eb8b30ed0d00b0cda6b6543b949d5ffe00bea54c04c81e1561d88 + - URL: 'https://dl.google.com/android/repository/platform-35_r02.zip' + name: platform_35 + sha256sum: 0988cacad01b38a18a47bac14a0695f246bc76c1b06c0eeb8eb0dc825ab0c8e0 + - project: gradle + name: gradle + - project: rust + name: rust + - project: uniffi-rs + name: uniffi-rs + - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]' + name: glean-wheels + sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]' + - name: cargo_vendor + project: glean + pkg_type: cargo_vendor + norec: + sha256sum: 0cb6a7093b93ecc8d8e13f02e5ec46a538b5eaf55ab027b46754bfbdeec2152e + - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' + name: gradle-dependencies + exec: '[% INCLUDE "fetch-gradle-dependencies" %]' + - filename: use-custom-gradle-repo.diff + - filename: use-uniffi-noop.diff 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][tor-browser-140.2.0esr-15.0-1] fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 21 Aug '25

21 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c29f471d by Henry Wilkes at 2025-08-21T09:24:12+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44115: Make the remove all bridges dialog button destructive. - - - - - 1 changed file: - browser/components/torpreferences/content/connectionPane.js Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2173,6 +2173,7 @@ const gBridgeSettings = { Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING + Services.prompt.BUTTON_POS_0_DEFAULT + + Services.prompt.BUTTON_DEFAULT_IS_DESTRUCTIVE + Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL; const [titleString, bodyString, removeString] = View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c29f471… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c29f471… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! [android] TBA strings
by henry (＠henry) 21 Aug '25

21 Aug '25

henry pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: d590dc64 by Henry Wilkes at 2025-08-21T08:06:38+00:00 fixup! [android] TBA strings TB 43179: Fixup the string comments for translators. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -137,10 +137,9 @@  <string name="connection_assist_back_button_content_description_start_again">Start again</string> - -  +  <string name="notification_close_tor_browser_tabs">Close %s’s tabs?</string> -  +  <string name="notification_close_tor_browser_tabs_long">Tap or swipe this notification to close %s’s tabs</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d590dc6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d590dc6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 4 commits: fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 20 Aug '25

20 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 9b43d384 by Henry Wilkes at 2025-08-20T17:40:32+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43727: Drop the moz-toggle label-align-after attribute. - - - - - 941d407e by Henry Wilkes at 2025-08-20T17:40:33+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43727: Drop the moz-toggle label-align-after attribute. - - - - - 57bb4918 by Henry Wilkes at 2025-08-20T17:40:34+01:00 fixup! TB 7494: Create local home page for TBB. TB 43727: Align "Onionize" label before the toggle. - - - - - 1ab41197 by Henry Wilkes at 2025-08-20T17:57:06+01:00 fixup! Customize moz-toggle for tor-browser. TB 43727: Drop the moz-toggle label-align-after attribute. Upstream now does this by default. Instead we add the label-align-before attribute for the exception in about:tor. - - - - - 6 changed files: - browser/components/abouttor/content/aboutTor.html - browser/components/torpreferences/content/connectionPane.inc.xhtml - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/content/widgets/lit-utils.mjs - toolkit/content/widgets/moz-input-common.css - toolkit/content/widgets/moz-toggle/moz-toggle.mjs Changes: ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -77,6 +77,7 @@ /> <moz-toggle id="onionize-toggle" + label-align-before="" data-l10n-id="tor-browser-home-onionize-toggle" data-l10n-attrs="label" ></moz-toggle> ===================================== browser/components/torpreferences/content/connectionPane.inc.xhtml ===================================== @@ -79,7 +79,6 @@ <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" /> @@ -145,7 +144,6 @@ <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" /> ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -62,7 +62,7 @@ <button id="viewLogButton"></button> <div id="quickstartContainer"> - <moz-toggle id="quickstartToggle" label-align-after=""></moz-toggle> + <moz-toggle id="quickstartToggle"></moz-toggle> </div> <div class="button-container"> ===================================== toolkit/content/widgets/lit-utils.mjs ===================================== @@ -250,6 +250,9 @@ export class MozBaseInputElement extends MozLitElement { supportPage: { type: String, attribute: "support-page" }, accessKey: { type: String, mapped: true, fluent: true }, parentDisabled: { type: Boolean, state: true }, + // label-align-before is a customisation for the moz-toggle in about:tor. + // See tor-browser#43727. + labelAlignBefore: { type: Boolean, attribute: "label-align-before" }, }; static inputLayout = "inline"; @@ -404,9 +407,10 @@ export class MozBaseInputElement extends MozLitElement { part="label" for="input" shownaccesskey=${ifDefined(this.accessKey)} - >${this.isInlineLayout + >${this.labelAlignBefore ? this.labelTemplate() : ""}${this + .isInlineLayout ? this.inputTemplate() - : ""}${this.labelTemplate()}</label + : ""}${this.labelAlignBefore ? "" : this.labelTemplate()}</label >${this.hasDescription ? "" : this.supportLinkTemplate()} </span> ${this.descriptionTemplate()} ===================================== toolkit/content/widgets/moz-input-common.css ===================================== @@ -12,6 +12,7 @@ --input-margin-block-adjust: calc((1lh - var(--input-height)) / 2); --icon-margin-block-adjust: calc((1lh - var(--icon-size-default)) / 2); --input-margin-inline-start-adjust: calc(-1 * var(--input-space-offset)); + --input-margin-inline-adjust: var(--input-margin-inline-start-adjust) var(--space-small); } :host(:not([hidden])) { @@ -32,6 +33,13 @@ --input-margin-block-adjust: 0; } + :host([label-align-before]) { + /* The label is before the input, so we need the input to only have a + * starting gap between it and the label. */ + --input-space-offset: 0; + --input-margin-inline-adjust: var(--space-small) 0; + } + @media (forced-colors) { :host(:state(disabled)) { color: GrayText; @@ -72,7 +80,7 @@ line-height: inherit; vertical-align: top; margin-block: var(--input-margin-block-adjust); - margin-inline: var(--input-margin-inline-start-adjust) var(--space-small); + margin-inline: var(--input-margin-inline-adjust); :host(:not(:state(has-label))) & { margin-inline-end: 0; ===================================== toolkit/content/widgets/moz-toggle/moz-toggle.mjs ===================================== @@ -27,8 +27,6 @@ export default class MozToggle extends MozBaseInputElement { pressed: { type: Boolean, reflect: true }, // Extension for tor-browser. Used for tor-browser#41333. title: { type: String, attribute: "title" }, - // Extension for tor-browser. Used for tor-browser#40837. - labelAlignAfter: { type: Boolean, attribute: "label-align-after" }, }; static activatedProperty = "pressed"; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4390c5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4390c5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 4 commits: fixup! BB 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 46629939 by Pier Angelo Vendrame at 2025-08-20T18:03:50+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. We are not really interested in removing them. We're interested in them not calling Mozilla. However, we have a central patch for RemoteSettings, so we do not need to patch the single user. Or, if we did, at least we should patch UrlClassifierExceptionListService where it creates its RemoteSettings instance. - - - - - cc561c52 by Pier Angelo Vendrame at 2025-08-20T18:03:51+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. Remove this page as part of another commit. This comit should go away automatically at the next rebase. - - - - - 2164237e by Pier Angelo Vendrame at 2025-08-20T18:03:52+02:00 fixup! BB 42716: Disable unwanted about: pages BB 43795: Restore the URL classifier XPCOM components. Move the commit where we disable about:urlclassifier. - - - - - 673df9af by Pier Angelo Vendrame at 2025-08-20T18:03:52+02:00 fixup! BB 42730: Patch RemoteSettings to use only local dumps as a data source Make explicit that blanking REMOTE_SETTINGS_SERVER_URL is our change. - - - - - 4 changed files: - docshell/base/nsAboutRedirector.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - toolkit/modules/AppConstants.sys.mjs Changes: ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -220,6 +220,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #endif #ifndef BASE_BROWSER_VERSION + // We disable safe browsing and the data update mechanisms. So this page + // will be non-functional or at least unreliable. {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif ===================================== netwerk/url-classifier/UrlClassifierFeatureBase.cpp ===================================== @@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService = do_GetService("@mozilla.org/url-classifier/exception-list-service;1"); - if (!exceptionListService) { + if (NS_WARN_IF(!exceptionListService)) { return; } ===================================== netwerk/url-classifier/components.conf ===================================== @@ -13,4 +13,24 @@ Classes = [ 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton', 'headers': ['mozilla/net/ChannelClassifierService.h'], }, + { + 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'], + 'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs', + 'constructor': 'UrlClassifierExceptionListService', + }, + { + 'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}', + 'interfaces': ['nsIUrlClassifierExceptionListEntry'], + 'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'], + 'type': 'mozilla::net::UrlClassifierExceptionListEntry', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'], + }, + { + 'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}', + 'interfaces': ['nsIUrlClassifierExceptionList'], + 'headers': ['mozilla/net/UrlClassifierExceptionList.h'], + 'type': 'mozilla::net::UrlClassifierExceptionList', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'], + }, ] ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({ ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@, REMOTE_SETTINGS_SERVER_URL: -#ifdef MOZ_THUNDERBIRD +#if defined(BASE_BROWSER_VERSION) + "", +#elif defined(MOZ_THUNDERBIRD) "https://thunderbird-settings.thunderbird.net/v1", #else - "", + "https://firefox.settings.services.mozilla.com/v1", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/dd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/dd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 4 commits: fixup! BB 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 978afe83 by Pier Angelo Vendrame at 2025-08-20T18:01:38+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. We are not really interested in removing them. We're interested in them not calling Mozilla. However, we have a central patch for RemoteSettings, so we do not need to patch the single user. Or, if we did, at least we should patch UrlClassifierExceptionListService where it creates its RemoteSettings instance. - - - - - f183749f by Pier Angelo Vendrame at 2025-08-20T18:01:40+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. Remove this page as part of another commit. This comit should go away automatically at the next rebase. - - - - - 72840c42 by Pier Angelo Vendrame at 2025-08-20T18:01:40+02:00 fixup! BB 42716: Disable unwanted about: pages BB 43795: Restore the URL classifier XPCOM components. Move the commit where we disable about:urlclassifier. - - - - - 227d47ef by Pier Angelo Vendrame at 2025-08-20T18:01:41+02:00 fixup! BB 42730: Patch RemoteSettings to use only local dumps as a data source Make explicit that blanking REMOTE_SETTINGS_SERVER_URL is our change. - - - - - 4 changed files: - docshell/base/nsAboutRedirector.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - toolkit/modules/AppConstants.sys.mjs Changes: ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -218,6 +218,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #endif #ifndef BASE_BROWSER_VERSION + // We disable safe browsing and the data update mechanisms. So this page + // will be non-functional or at least unreliable. {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif ===================================== netwerk/url-classifier/UrlClassifierFeatureBase.cpp ===================================== @@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService = do_GetService("@mozilla.org/url-classifier/exception-list-service;1"); - if (!exceptionListService) { + if (NS_WARN_IF(!exceptionListService)) { return; } ===================================== netwerk/url-classifier/components.conf ===================================== @@ -13,4 +13,24 @@ Classes = [ 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton', 'headers': ['mozilla/net/ChannelClassifierService.h'], }, + { + 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'], + 'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs', + 'constructor': 'UrlClassifierExceptionListService', + }, + { + 'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}', + 'interfaces': ['nsIUrlClassifierExceptionListEntry'], + 'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'], + 'type': 'mozilla::net::UrlClassifierExceptionListEntry', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'], + }, + { + 'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}', + 'interfaces': ['nsIUrlClassifierExceptionList'], + 'headers': ['mozilla/net/UrlClassifierExceptionList.h'], + 'type': 'mozilla::net::UrlClassifierExceptionList', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'], + }, ] ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({ ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@, REMOTE_SETTINGS_SERVER_URL: -#ifdef MOZ_THUNDERBIRD +#if defined(BASE_BROWSER_VERSION) + "", +#elif defined(MOZ_THUNDERBIRD) "https://thunderbird-settings.thunderbird.net/v1", #else - "", + "https://firefox.settings.services.mozilla.com/v1", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dcfb18… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dcfb18… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 4 commits: fixup! BB 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 57dfb0ea by Pier Angelo Vendrame at 2025-08-20T17:59:14+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. We are not really interested in removing them. We're interested in them not calling Mozilla. However, we have a central patch for RemoteSettings, so we do not need to patch the single user. Or, if we did, at least we should patch UrlClassifierExceptionListService where it creates its RemoteSettings instance. - - - - - 61ec52da by Pier Angelo Vendrame at 2025-08-20T17:59:17+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 43795: Restore the URL classifier XPCOM components. Remove this page as part of another commit. This comit should go away automatically at the next rebase. - - - - - dd621fde by Pier Angelo Vendrame at 2025-08-20T17:59:19+02:00 fixup! BB 42716: Disable unwanted about: pages BB 43795: Restore the URL classifier XPCOM components. Move the commit where we disable about:urlclassifier. - - - - - 4390c5a4 by Pier Angelo Vendrame at 2025-08-20T17:59:21+02:00 fixup! BB 42730: Patch RemoteSettings to use only local dumps as a data source Make explicit that blanking REMOTE_SETTINGS_SERVER_URL is our change. - - - - - 4 changed files: - docshell/base/nsAboutRedirector.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - toolkit/modules/AppConstants.sys.mjs Changes: ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -223,6 +223,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #endif #ifndef BASE_BROWSER_VERSION + // We disable safe browsing and the data update mechanisms. So this page + // will be non-functional or at least unreliable. {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif ===================================== netwerk/url-classifier/UrlClassifierFeatureBase.cpp ===================================== @@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService = do_GetService("@mozilla.org/url-classifier/exception-list-service;1"); - if (!exceptionListService) { + if (NS_WARN_IF(!exceptionListService)) { return; } ===================================== netwerk/url-classifier/components.conf ===================================== @@ -13,4 +13,24 @@ Classes = [ 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton', 'headers': ['mozilla/net/ChannelClassifierService.h'], }, + { + 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'], + 'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs', + 'constructor': 'UrlClassifierExceptionListService', + }, + { + 'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}', + 'interfaces': ['nsIUrlClassifierExceptionListEntry'], + 'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'], + 'type': 'mozilla::net::UrlClassifierExceptionListEntry', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'], + }, + { + 'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}', + 'interfaces': ['nsIUrlClassifierExceptionList'], + 'headers': ['mozilla/net/UrlClassifierExceptionList.h'], + 'type': 'mozilla::net::UrlClassifierExceptionList', + 'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'], + }, ] ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({ ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@, REMOTE_SETTINGS_SERVER_URL: -#ifdef MOZ_THUNDERBIRD +#if defined(BASE_BROWSER_VERSION) + "", +#elif defined(MOZ_THUNDERBIRD) "https://thunderbird-settings.thunderbird.net/v1", #else - "", + "https://firefox.settings.services.mozilla.com/v1", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9691ec… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9691ec… You're receiving this email because of your account on gitlab.torproject.org.

1 0