- tbb-commits - lists.torproject.org

[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

[Git][tpo/applications/tor-browser-build][main] Bug 40698: Remove locale from tbb_version.json/version.json
by boklm (＠boklm) 20 Aug '25

20 Aug '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7d72dc2c by Nicolas Vigier at 2025-08-20T15:23:18+02:00 Bug 40698: Remove locale from tbb_version.json/version.json - - - - - 1 changed file: - projects/browser/build Changes: ===================================== projects/browser/build ===================================== @@ -262,7 +262,7 @@ do rm -rf defaults # create tbb_version.json (torbrowser) or version.json (mullvadbrowser) # file for tor-browser#25020 and tor-browser-build#41044 - echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../[% c("var/version_json") %] + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]"}' > ../[% c("var/version_json") %] popd done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… 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] 2 commits: fixup! BB 40926: Implemented the New Identity feature
by morgan (＠morgan) 20 Aug '25

20 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7535773c by Henry Wilkes at 2025-08-20T13:42:42+00:00 fixup! BB 40926: Implemented the New Identity feature TB 44034: Update new identity checkbox string. TB 44040: Use the prompt API for new identity. - - - - - ddc85dbe by Henry Wilkes at 2025-08-20T13:42:47+00:00 fixup! Base Browser strings TB 44034: Update new identity checkbox string. - - - - - 6 changed files: - − browser/components/newidentity/content/newIdentityDialog.css - − browser/components/newidentity/content/newIdentityDialog.js - − browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.css deleted ===================================== @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#infoTitle { - font-weight: 600; -} ===================================== browser/components/newidentity/content/newIdentityDialog.js deleted ===================================== @@ -1,17 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -document.addEventListener("dialogaccept", () => { - const retvals = window.arguments[0]; - retvals.confirmed = true; - retvals.neverAskAgain = document.getElementById("neverAskAgain").checked; -}); - -document.addEventListener("DOMContentLoaded", () => { - const dialog = document.getElementById("newIdentityDialog"); - - const accept = dialog.getButton("accept"); - document.l10n.setAttributes(accept, "new-identity-dialog-confirm"); - accept.classList.add("danger-button"); -}); ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml deleted ===================================== @@ -1,65 +0,0 @@ -<?xml version="1.0"?> - - - - - -<?csp default-src chrome: ?> - -<window - id="newIdentityDialogWindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - aria-labelledby="infoTitle" - aria-describedby="infoBody" -> - <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> - <linkset> - <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> - <html:link - rel="stylesheet" - href="chrome://global/content/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://global/skin/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://browser/content/newIdentityDialog.css" - /> - - <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> - </linkset> - - <div xmlns="http://www.w3.org/1999/xhtml"> - <div id="dialogGrid"> - <div class="dialogRow" id="infoRow"> - <div id="iconContainer"> - <xul:image id="infoIcon" /> - </div> - <div id="infoContainer"> - <xul:description - id="infoTitle" - data-l10n-id="new-identity-dialog-title" - /> - <xul:description - id="infoBody" - data-l10n-id="new-identity-dialog-description" - /> - <xul:checkbox - id="neverAskAgain" - data-l10n-id="new-identity-dialog-never-ask-checkbox" - /> - </div> - </div> - </div> - </div> - - <script src="chrome://browser/content/newIdentityDialog.js" /> - </dialog> -</window> ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -513,18 +513,37 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { const prefConfirm = "browser.new_identity.confirm_newnym"; const shouldConfirm = Services.prefs.getBoolPref(prefConfirm, true); if (shouldConfirm) { - const params = { - confirmed: false, - neverAskAgain: false, - }; - await window.gDialogBox.open( - "chrome://browser/content/newIdentityDialog.xhtml", - params + const [titleString, bodyString, checkboxString, restartString] = + await document.l10n.formatValues([ + { id: "new-identity-dialog-title" }, + { id: "new-identity-dialog-description" }, + { id: "restart-warning-dialog-do-not-warn-checkbox" }, + { id: "restart-warning-dialog-restart-button" }, + ]); + const flags = + 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 propBag = await Services.prompt.asyncConfirmEx( + window.browsingContext, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleString, + bodyString, + flags, + restartString, + null, + null, + checkboxString, + false ); - Services.prefs.setBoolPref(prefConfirm, !params.neverAskAgain); - if (!params.confirmed) { + if (propBag.get("buttonNumClicked") !== 0) { return; } + if (propBag.get("checked")) { + Services.prefs.setBoolPref(prefConfirm, false); + } } const impl = new NewIdentityImpl(); ===================================== browser/components/newidentity/jar.mn ===================================== @@ -1,5 +1,2 @@ browser.jar: content/browser/newidentity.js (content/newidentity.js) - content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) - content/browser/newIdentityDialog.css (content/newIdentityDialog.css) - content/browser/newIdentityDialog.js (content/newIdentityDialog.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -63,10 +63,6 @@ toolbar-new-identity = new-identity-dialog-title = Reset your identity? new-identity-dialog-description = { -brand-short-name } will close all windows and tabs. All website sessions will be lost. -new-identity-dialog-never-ask-checkbox = - .label = Never ask me again -new-identity-dialog-confirm = - .label = Restart { -brand-short-name } ## New identity: blocked home page notification. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/8f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/8f… 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] 2 commits: fixup! BB 40926: Implemented the New Identity feature
by morgan (＠morgan) 20 Aug '25

20 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 69cb9a3b by Henry Wilkes at 2025-08-20T13:41:08+00:00 fixup! BB 40926: Implemented the New Identity feature TB 44034: Update new identity checkbox string. TB 44040: Use the prompt API for new identity. - - - - - dcfb181d by Henry Wilkes at 2025-08-20T13:41:09+00:00 fixup! Base Browser strings TB 44034: Update new identity checkbox string. - - - - - 6 changed files: - − browser/components/newidentity/content/newIdentityDialog.css - − browser/components/newidentity/content/newIdentityDialog.js - − browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.css deleted ===================================== @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#infoTitle { - font-weight: 600; -} ===================================== browser/components/newidentity/content/newIdentityDialog.js deleted ===================================== @@ -1,17 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -document.addEventListener("dialogaccept", () => { - const retvals = window.arguments[0]; - retvals.confirmed = true; - retvals.neverAskAgain = document.getElementById("neverAskAgain").checked; -}); - -document.addEventListener("DOMContentLoaded", () => { - const dialog = document.getElementById("newIdentityDialog"); - - const accept = dialog.getButton("accept"); - document.l10n.setAttributes(accept, "new-identity-dialog-confirm"); - accept.classList.add("danger-button"); -}); ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml deleted ===================================== @@ -1,65 +0,0 @@ -<?xml version="1.0"?> - - - - - -<?csp default-src chrome: ?> - -<window - id="newIdentityDialogWindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - aria-labelledby="infoTitle" - aria-describedby="infoBody" -> - <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> - <linkset> - <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> - <html:link - rel="stylesheet" - href="chrome://global/content/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://global/skin/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://browser/content/newIdentityDialog.css" - /> - - <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> - </linkset> - - <div xmlns="http://www.w3.org/1999/xhtml"> - <div id="dialogGrid"> - <div class="dialogRow" id="infoRow"> - <div id="iconContainer"> - <xul:image id="infoIcon" /> - </div> - <div id="infoContainer"> - <xul:description - id="infoTitle" - data-l10n-id="new-identity-dialog-title" - /> - <xul:description - id="infoBody" - data-l10n-id="new-identity-dialog-description" - /> - <xul:checkbox - id="neverAskAgain" - data-l10n-id="new-identity-dialog-never-ask-checkbox" - /> - </div> - </div> - </div> - </div> - - <script src="chrome://browser/content/newIdentityDialog.js" /> - </dialog> -</window> ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -513,18 +513,37 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { const prefConfirm = "browser.new_identity.confirm_newnym"; const shouldConfirm = Services.prefs.getBoolPref(prefConfirm, true); if (shouldConfirm) { - const params = { - confirmed: false, - neverAskAgain: false, - }; - await window.gDialogBox.open( - "chrome://browser/content/newIdentityDialog.xhtml", - params + const [titleString, bodyString, checkboxString, restartString] = + await document.l10n.formatValues([ + { id: "new-identity-dialog-title" }, + { id: "new-identity-dialog-description" }, + { id: "restart-warning-dialog-do-not-warn-checkbox" }, + { id: "restart-warning-dialog-restart-button" }, + ]); + const flags = + 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 propBag = await Services.prompt.asyncConfirmEx( + window.browsingContext, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleString, + bodyString, + flags, + restartString, + null, + null, + checkboxString, + false ); - Services.prefs.setBoolPref(prefConfirm, !params.neverAskAgain); - if (!params.confirmed) { + if (propBag.get("buttonNumClicked") !== 0) { return; } + if (propBag.get("checked")) { + Services.prefs.setBoolPref(prefConfirm, false); + } } const impl = new NewIdentityImpl(); ===================================== browser/components/newidentity/jar.mn ===================================== @@ -1,5 +1,2 @@ browser.jar: content/browser/newidentity.js (content/newidentity.js) - content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) - content/browser/newIdentityDialog.css (content/newIdentityDialog.css) - content/browser/newIdentityDialog.js (content/newIdentityDialog.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -63,10 +63,6 @@ toolbar-new-identity = new-identity-dialog-title = Reset your identity? new-identity-dialog-description = { -brand-short-name } will close all windows and tabs. All website sessions will be lost. -new-identity-dialog-never-ask-checkbox = - .label = Never ask me again -new-identity-dialog-confirm = - .label = Restart { -brand-short-name } ## New identity: blocked home page notification. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4891bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4891bc… 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] 2 commits: fixup! BB 40926: Implemented the New Identity feature
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: 68e8f5df by Henry Wilkes at 2025-08-20T13:32:15+00:00 fixup! BB 40926: Implemented the New Identity feature TB 44034: Update new identity checkbox string. TB 44040: Use the prompt API for new identity. - - - - - 9691ec21 by Henry Wilkes at 2025-08-20T13:32:15+00:00 fixup! Base Browser strings TB 44034: Update new identity checkbox string. - - - - - 6 changed files: - − browser/components/newidentity/content/newIdentityDialog.css - − browser/components/newidentity/content/newIdentityDialog.js - − browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.css deleted ===================================== @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#infoTitle { - font-weight: 600; -} ===================================== browser/components/newidentity/content/newIdentityDialog.js deleted ===================================== @@ -1,17 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -document.addEventListener("dialogaccept", () => { - const retvals = window.arguments[0]; - retvals.confirmed = true; - retvals.neverAskAgain = document.getElementById("neverAskAgain").checked; -}); - -document.addEventListener("DOMContentLoaded", () => { - const dialog = document.getElementById("newIdentityDialog"); - - const accept = dialog.getButton("accept"); - document.l10n.setAttributes(accept, "new-identity-dialog-confirm"); - accept.classList.add("danger-button"); -}); ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml deleted ===================================== @@ -1,65 +0,0 @@ -<?xml version="1.0"?> - - - - - -<?csp default-src chrome: ?> - -<window - id="newIdentityDialogWindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - aria-labelledby="infoTitle" - aria-describedby="infoBody" -> - <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> - <linkset> - <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> - <html:link - rel="stylesheet" - href="chrome://global/content/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://global/skin/commonDialog.css" - /> - <html:link - rel="stylesheet" - href="chrome://browser/content/newIdentityDialog.css" - /> - - <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> - </linkset> - - <div xmlns="http://www.w3.org/1999/xhtml"> - <div id="dialogGrid"> - <div class="dialogRow" id="infoRow"> - <div id="iconContainer"> - <xul:image id="infoIcon" /> - </div> - <div id="infoContainer"> - <xul:description - id="infoTitle" - data-l10n-id="new-identity-dialog-title" - /> - <xul:description - id="infoBody" - data-l10n-id="new-identity-dialog-description" - /> - <xul:checkbox - id="neverAskAgain" - data-l10n-id="new-identity-dialog-never-ask-checkbox" - /> - </div> - </div> - </div> - </div> - - <script src="chrome://browser/content/newIdentityDialog.js" /> - </dialog> -</window> ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -513,18 +513,37 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { const prefConfirm = "browser.new_identity.confirm_newnym"; const shouldConfirm = Services.prefs.getBoolPref(prefConfirm, true); if (shouldConfirm) { - const params = { - confirmed: false, - neverAskAgain: false, - }; - await window.gDialogBox.open( - "chrome://browser/content/newIdentityDialog.xhtml", - params + const [titleString, bodyString, checkboxString, restartString] = + await document.l10n.formatValues([ + { id: "new-identity-dialog-title" }, + { id: "new-identity-dialog-description" }, + { id: "restart-warning-dialog-do-not-warn-checkbox" }, + { id: "restart-warning-dialog-restart-button" }, + ]); + const flags = + 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 propBag = await Services.prompt.asyncConfirmEx( + window.browsingContext, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleString, + bodyString, + flags, + restartString, + null, + null, + checkboxString, + false ); - Services.prefs.setBoolPref(prefConfirm, !params.neverAskAgain); - if (!params.confirmed) { + if (propBag.get("buttonNumClicked") !== 0) { return; } + if (propBag.get("checked")) { + Services.prefs.setBoolPref(prefConfirm, false); + } } const impl = new NewIdentityImpl(); ===================================== browser/components/newidentity/jar.mn ===================================== @@ -1,5 +1,2 @@ browser.jar: content/browser/newidentity.js (content/newidentity.js) - content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) - content/browser/newIdentityDialog.css (content/newIdentityDialog.css) - content/browser/newIdentityDialog.js (content/newIdentityDialog.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -63,10 +63,6 @@ toolbar-new-identity = new-identity-dialog-title = Reset your identity? new-identity-dialog-description = { -brand-short-name } will close all windows and tabs. All website sessions will be lost. -new-identity-dialog-never-ask-checkbox = - .label = Never ask me again -new-identity-dialog-confirm = - .label = Restart { -brand-short-name } ## New identity: blocked home page notification. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b66d9c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b66d9c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40697: Remove repackage_browser.sh.
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 427fdb1b by Pier Angelo Vendrame at 2025-08-20T09:20:47+02:00 Bug 40697: Remove repackage_browser.sh. This script is very old, has not been maintained and does not work with the current versions of Tor Browser anymore. Use the scripts in tor-browser.git/tools/torbrowser, instead. - - - - - 1 changed file: - − tools/repackage_browser.sh Changes: ===================================== tools/repackage_browser.sh deleted ===================================== @@ -1,58 +0,0 @@ -#!/bin/bash - -# This script allows you to repackage a Tor Browser bundle using an -# obj-x86_64-pc-linux-gnu directory from a local tor-browser.git build. -# -# This script will download the current Tor Browser version (using -# var/torbrowser_version from rbm config, or an optional second argument) -# and repackage it with the specified obj directory. -# -# The new repackaged bundle can be found in the _repackaged directory. - -set -e - -display_usage() { - echo -e "\\nUsage: $0 firefox_obj_path [torbrowser-version]\\n" -} -if [ $# -lt 1 ] || [ $# -gt 2 ] -then - display_usage - exit 1 -fi - -DIRNAME="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -OBJ_PATH=$1 -if [ $# -eq 2 ] -then - TOR_VERSION="$2" -else - TOR_VERSION=$("$DIRNAME"/../rbm/rbm showconf tor-browser var/torbrowser_version) -fi -TOR_FILENAME=tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz -TOR_BROWSER_URL=https://dist.torproject.org/torbrowser/"${TOR_VERSION}"/"${TOR_FILENAME}" -TMPDIR="$(mktemp -d)" - -( -cd "$TMPDIR" -wget "$TOR_BROWSER_URL" -wget "$TOR_BROWSER_URL".asc -gpg --no-default-keyring --keyring "$DIRNAME"/../keyring/torbrowser.gpg --verify "${TOR_FILENAME}".asc "${TOR_FILENAME}" - -# From projects/firefox/build: replace firefox binary by the wrapper and strip libraries/binaries -tar xf "${TOR_FILENAME}" -cp -r "${OBJ_PATH}"/dist/firefox . -rm firefox/firefox-bin -mv firefox/firefox firefox/firefox.real -for LIB in firefox/*.so firefox/gtk2/*.so firefox/firefox.real firefox/plugin-container firefox/updater -do - strip "$LIB" -done - -# Overwrite extracted tor-browser with locally built files and move to _repackaged folder -cp -r firefox/* tor-browser_en-US/Browser -rm -rf firefox "${TOR_FILENAME}" -REPACKAGED_DIR="$DIRNAME"/_repackaged/ -mkdir -p "$REPACKAGED_DIR" -mv tor-browser_en-US "$REPACKAGED_DIR"/tor-browser-"$(date '+%Y%m%d%H%M%S')" -rm -rf "$TMPDIR" -) 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/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 8f29664e by Beatriz Rizental at 2025-08-20T14:39:14+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -282,6 +282,8 @@ pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); +// tor-browser#43986: Explicitly disable bounce tracking protection +pref("privacy.bounceTrackingProtection.mode", 0); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); // tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8f2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8f2… 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] fixup! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 4891bcd3 by Beatriz Rizental at 2025-08-20T14:38:13+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -282,6 +282,8 @@ pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); +// tor-browser#43986: Explicitly disable bounce tracking protection +pref("privacy.bounceTrackingProtection.mode", 0); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); // tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4891bcd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4891bcd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41543: Update Ubuntu version used to run mmdebstrap to 24.04.3
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: d15a7ca4 by NoisyCoil at 2025-08-20T14:27:02+02:00 Bug 41543: Update Ubuntu version used to run mmdebstrap to 24.04.3 - - - - - 1 changed file: - projects/mmdebstrap-image/config Changes: ===================================== projects/mmdebstrap-image/config ===================================== @@ -7,7 +7,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04.3 + ubuntu_version: 24.04.3 pre: | #!/bin/sh @@ -68,4 +68,4 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: ad33b7ae47b75c92c2e2fe21fd4612e15357e67679d8751d6ce892a475be24fe + sha256sum: 6bc2cde3930ad088b3bb46fa45279e96d25bc3810f209850ecbe4722711874f9 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][maint-14.5] Bug 41543: Update Ubuntu version used to run mmdebstrap to 24.04.3
by Pier Angelo Vendrame (＠pierov) 20 Aug '25

20 Aug '25

Pier Angelo Vendrame pushed to branch maint-14.5 at The Tor Project / Applications / tor-browser-build Commits: aee4bf4a by NoisyCoil at 2025-08-19T18:07:27+02:00 Bug 41543: Update Ubuntu version used to run mmdebstrap to 24.04.3 - - - - - 1 changed file: - projects/mmdebstrap-image/config Changes: ===================================== projects/mmdebstrap-image/config ===================================== @@ -7,7 +7,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04.3 + ubuntu_version: 24.04.3 pre: | #!/bin/sh @@ -68,4 +68,4 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: ad33b7ae47b75c92c2e2fe21fd4612e15357e67679d8751d6ce892a475be24fe + sha256sum: 6bc2cde3930ad088b3bb46fa45279e96d25bc3810f209850ecbe4722711874f9 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][tor-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: b66d9c97 by Beatriz Rizental at 2025-08-20T10:31:16+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -282,6 +282,8 @@ pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); +// tor-browser#43986: Explicitly disable bounce tracking protection +pref("privacy.bounceTrackingProtection.mode", 0); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); // tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b66d9c9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b66d9c9… 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] fixup! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 98035f31 by Beatriz Rizental at 2025-08-20T10:42:16+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -251,6 +251,9 @@ pref("security.xfocsp.errorReporting.enabled", false); // Added in tor-browser#41496 even though it shuld be already always disabled // since we disable MOZ_CRASHREPORTER. pref("breakpad.reportURL", "data:"); +// tor-browser#43985: Disable captcha detector code that is just used upstream +// for identifying captchas with the purpose of sending telemetry about it. +pref("captchadetection.actor.enabled", false); #ifdef XP_WIN // Defense-in-depth: ensure that the Windows default browser agent will // not ping Mozilla if it is somehow present (we omit it at build time). View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/980… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/980… 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] fixup! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 35774dc9 by Beatriz Rizental at 2025-08-20T10:37:12+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -251,6 +251,9 @@ pref("security.xfocsp.errorReporting.enabled", false); // Added in tor-browser#41496 even though it shuld be already always disabled // since we disable MOZ_CRASHREPORTER. pref("breakpad.reportURL", "data:"); +// tor-browser#43985: Disable captcha detector code that is just used upstream +// for identifying captchas with the purpose of sending telemetry about it. +pref("captchadetection.actor.enabled", false); #ifdef XP_WIN // Defense-in-depth: ensure that the Windows default browser agent will // not ping Mozilla if it is somehow present (we omit it at build time). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35774dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35774dc… 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! Firefox preference overrides.
by brizental (＠brizental) 20 Aug '25

20 Aug '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: e98acd8f by Beatriz Rizental at 2025-08-20T10:10:37+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -251,6 +251,9 @@ pref("security.xfocsp.errorReporting.enabled", false); // Added in tor-browser#41496 even though it shuld be already always disabled // since we disable MOZ_CRASHREPORTER. pref("breakpad.reportURL", "data:"); +// tor-browser#43985: Disable captcha detector code that is just used upstream +// for identifying captchas with the purpose of sending telemetry about it. +pref("captchadetection.actor.enabled", false); #ifdef XP_WIN // Defense-in-depth: ensure that the Windows default browser agent will // not ping Mozilla if it is somehow present (we omit it at build time). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e98acd8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e98acd8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40551: Remove our patch for the Go compiler.
by Pier Angelo Vendrame (＠pierov) 19 Aug '25

19 Aug '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b484354a by Pier Angelo Vendrame at 2025-08-19T18:44:06+02:00 Bug 40551: Remove our patch for the Go compiler. - - - - - 4 changed files: - − projects/go/0001-Use-fixed-go-build-tmp-directory.patch - projects/go/README.md - projects/go/build - projects/go/config Changes: ===================================== projects/go/0001-Use-fixed-go-build-tmp-directory.patch deleted ===================================== @@ -1,36 +0,0 @@ -From 2c1c98d6404284df744a194dd23bd3660f365387 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 17 Apr 2020 10:24:23 +0000 -Subject: [PATCH] Use fixed go-build tmp directory - -Use fixed go-build tmp directory, when the directory does not exist, in -order to avoid some reproducibility issues where build directory gets -embedded in generated binaries. ---- - src/cmd/go/internal/work/action.go | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 8beb1345d0..dccf39c1c1 100644 ---- a/src/cmd/go/internal/work/action.go -+++ b/src/cmd/go/internal/work/action.go -@@ -279,9 +279,13 @@ func NewBuilder(workDir string) *Builder { - if !buildInitStarted { - panic("internal error: NewBuilder called before BuildInit") - } -- tmp, err := os.MkdirTemp(cfg.Getenv("GOTMPDIR"), "go-build") -- if err != nil { -- base.Fatalf("go: creating work dir: %v", err) -+ tmp := filepath.Join(cfg.Getenv("GOTMPDIR"), "go-build-workdir") -+ _, err := os.Stat(tmp) -+ if !os.IsNotExist(err) { -+ tmp, err = os.MkdirTemp(cfg.Getenv("GOTMPDIR"), "go-build") -+ if err != nil { -+ base.Fatalf("go: creating work dir: %v", err) -+ } - } - if !filepath.IsAbs(tmp) { - abs, err := filepath.Abs(tmp) --- -2.39.2 - ===================================== projects/go/README.md ===================================== @@ -7,7 +7,5 @@ We use it to build the various pluggable transports. We have another project (`go-bootstrap`) to provide it, and we make all targets use the `linux-x86_64` bootstrapper, since we don't need to cross-compile anything with it. -- On Android, we include a patch to fix a temporary directory whose path might - end up on binaries under some circumstances. - We create a compiler wrapper to include our custom arguments on macOS and on Windows because the `make.bash` script seems to lose our arguments. ===================================== projects/go/build ===================================== @@ -43,7 +43,6 @@ cd /var/tmp/dist/go/src chmod +x "$CC_FOR_TARGET" CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] - patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] ===================================== projects/go/config ===================================== @@ -92,5 +92,3 @@ input_files: name: go-bootstrap target_replace: '^.*browser-(?!testbuild).*': 'basebrowser-linux-x86_64' - - filename: 0001-Use-fixed-go-build-tmp-directory.patch - enable: '[% c("var/android") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] 7 commits: release: new version, 14.5.6 (linux-i686)
by ma1 (＠ma1) 19 Aug '25

19 Aug '25

ma1 pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 596b78fe by hackademix at 2025-08-19T19:29:29+02:00 release: new version, 14.5.6 (linux-i686) - - - - - e2740434 by hackademix at 2025-08-19T19:29:29+02:00 release: new version, 14.5.6 (linux-x86_64) - - - - - 77a900e4 by hackademix at 2025-08-19T19:29:29+02:00 release: new version, 14.5.6 (macos) - - - - - b87e16a5 by hackademix at 2025-08-19T19:29:30+02:00 release: new version, 14.5.6 (windows-i686) - - - - - 6fad930b by hackademix at 2025-08-19T19:29:30+02:00 release: new version, 14.5.6 (windows-x86_64) - - - - - 9e5b15f6 by hackademix at 2025-08-19T19:29:31+02:00 release: new version, 14.5.6 (android) - - - - - c913ee8f by hackademix at 2025-08-19T19:29:31+02:00 release: new version, 14.5.6 - - - - - 73 changed files: - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json - update_3/release/downloads.json - update_3/release/linux-i686/.htaccess - − update_3/release/linux-i686/update-14.5.2-14.5.5+13.5.20-linux-i686.xml - − update_3/release/linux-i686/update-14.5.3-14.5.5+13.5.20-linux-i686.xml - + update_3/release/linux-i686/update-14.5.3-14.5.6+13.5.21-linux-i686.xml - − update_3/release/linux-i686/update-14.5.4-14.5.5+13.5.20-linux-i686.xml - + update_3/release/linux-i686/update-14.5.4-14.5.6+13.5.21-linux-i686.xml - − update_3/release/linux-i686/update-14.5.5+13.5.20-linux-i686.xml - + update_3/release/linux-i686/update-14.5.5-14.5.6+13.5.21-linux-i686.xml - + update_3/release/linux-i686/update-14.5.6+13.5.21-linux-i686.xml - update_3/release/linux-x86_64/.htaccess - − update_3/release/linux-x86_64/update-14.5.2-14.5.5+13.5.20-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5.3-14.5.5+13.5.20-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.3-14.5.6+13.5.21-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5.4-14.5.5+13.5.20-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.4-14.5.6+13.5.21-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5.5+13.5.20-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.5-14.5.6+13.5.21-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.6+13.5.21-linux-x86_64.xml - update_3/release/macos/.htaccess - − update_3/release/macos/update-13.5.17-14.5.5+13.5.20-macos.xml - − update_3/release/macos/update-13.5.18-14.5.5+13.5.20-macos.xml - + update_3/release/macos/update-13.5.18-14.5.6+13.5.21-macos.xml - − update_3/release/macos/update-13.5.19-14.5.5+13.5.20-macos.xml - + update_3/release/macos/update-13.5.19-14.5.6+13.5.21-macos.xml - + update_3/release/macos/update-13.5.20-14.5.6+13.5.21-macos.xml - − update_3/release/macos/update-14.5.2-14.5.5+13.5.20-macos.xml - − update_3/release/macos/update-14.5.3-14.5.5+13.5.20-macos.xml - + update_3/release/macos/update-14.5.3-14.5.6+13.5.21-macos.xml - − update_3/release/macos/update-14.5.4-14.5.5+13.5.20-macos.xml - + update_3/release/macos/update-14.5.4-14.5.6+13.5.21-macos.xml - − update_3/release/macos/update-14.5.5+13.5.20-macos.xml - + update_3/release/macos/update-14.5.5-14.5.6+13.5.21-macos.xml - + update_3/release/macos/update-14.5.6+13.5.21-macos.xml - update_3/release/windows-i686/.htaccess - − update_3/release/windows-i686/update-13.5.17-14.5.5+13.5.20-windows-i686.xml - − update_3/release/windows-i686/update-13.5.18-14.5.5+13.5.20-windows-i686.xml - + update_3/release/windows-i686/update-13.5.18-14.5.6+13.5.21-windows-i686.xml - − update_3/release/windows-i686/update-13.5.19-14.5.5+13.5.20-windows-i686.xml - + update_3/release/windows-i686/update-13.5.19-14.5.6+13.5.21-windows-i686.xml - + update_3/release/windows-i686/update-13.5.20-14.5.6+13.5.21-windows-i686.xml - − update_3/release/windows-i686/update-14.5.2-14.5.5+13.5.20-windows-i686.xml - − update_3/release/windows-i686/update-14.5.3-14.5.5+13.5.20-windows-i686.xml - + update_3/release/windows-i686/update-14.5.3-14.5.6+13.5.21-windows-i686.xml - − update_3/release/windows-i686/update-14.5.4-14.5.5+13.5.20-windows-i686.xml - + update_3/release/windows-i686/update-14.5.4-14.5.6+13.5.21-windows-i686.xml - − update_3/release/windows-i686/update-14.5.5+13.5.20-windows-i686.xml - + update_3/release/windows-i686/update-14.5.5-14.5.6+13.5.21-windows-i686.xml - + update_3/release/windows-i686/update-14.5.6+13.5.21-windows-i686.xml - update_3/release/windows-x86_64/.htaccess - − update_3/release/windows-x86_64/update-13.5.17-14.5.5+13.5.20-windows-x86_64.xml - − update_3/release/windows-x86_64/update-13.5.18-14.5.5+13.5.20-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.18-14.5.6+13.5.21-windows-x86_64.xml - − update_3/release/windows-x86_64/update-13.5.19-14.5.5+13.5.20-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.19-14.5.6+13.5.21-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.20-14.5.6+13.5.21-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.2-14.5.5+13.5.20-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.3-14.5.5+13.5.20-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.3-14.5.6+13.5.21-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.4-14.5.5+13.5.20-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.4-14.5.6+13.5.21-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.5+13.5.20-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.5-14.5.6+13.5.21-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.6+13.5.21-windows-x86_64.xml The diff was not included because it is too large. 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/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! BB 18905: Hide unwanted items from help menu
by morgan (＠morgan) 19 Aug '25

19 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 518cccfe by Henry Wilkes at 2025-08-19T12:53:57+00:00 fixup! BB 18905: Hide unwanted items from help menu TB 43903: Hide "Report broken site" items. - - - - - 1 changed file: - browser/components/reportbrokensite/ReportBrokenSite.sys.mjs Changes: ===================================== browser/components/reportbrokensite/ReportBrokenSite.sys.mjs ===================================== @@ -452,9 +452,8 @@ export var ReportBrokenSite = new (class ReportBrokenSite { // Altering the disabled attribute on the command does not propagate // the change to the related menuitems (see bug 805653), so we change them all. const cmd = document.getElementById("cmd_reportBrokenSite"); - const allowedByPolicy = Services.policies.isAllowed( - "DisableFeedbackCommands" - ); + // Hide the items in base-browser. tor-browser#43903. + const allowedByPolicy = false; if (allowedByPolicy) { cmd.setAttribute("hidden", "false"); // see bug 805653 } else { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/518… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/518… You're receiving this email because of your account on gitlab.torproject.org.

1 0