October 2025 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-14.5.8-build1
by Pier Angelo Vendrame (＠pierov) 13 Oct '25

13 Oct '25

Pier Angelo Vendrame pushed new tag mb-14.5.8-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… 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 41590: Prepare Mullvad Browser 14.5.8.
by Pier Angelo Vendrame (＠pierov) 13 Oct '25

13 Oct '25

Pier Angelo Vendrame pushed to branch maint-14.5 at The Tor Project / Applications / tor-browser-build Commits: 5d62b89d by Pier Angelo Vendrame at 2025-10-13T16:01:05+02:00 Bug 41590: Prepare Mullvad Browser 14.5.8. - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,12 @@ +Mullvad Browser 14.5.8 - October 14 2025 + * All Platforms + * Updated NoScript to 13.2.1 + * Updated Mullvad Browser Extension to 0.9.5 + * Updated uBlock Origin to 1.66.4 + * Bug 44239: DDG HTML page and search results displayed incorrectly with Safest security setting [tor-browser] + * Bug 44240: Typo on dom.security.https_first_add_exception_on_failure [tor-browser] + * Bug 44244: Backport Security Fixes from Firefox 144 [tor-browser] + Mullvad Browser 14.5.7 - September 16 2025 * All Platforms * Updated uBlock Origin to 1.66.0 ===================================== projects/browser/config ===================================== @@ -111,16 +111,16 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4551629/noscript-13.0.9.x… + - URL: https://addons.mozilla.org/firefox/downloads/file/4593796/noscript-13.2.1.x… name: noscript - sha256sum: 525ab61aff21f67d10c3e20965a86ed479631549908a658f54692adc47d771f5 - - URL: https://addons.mozilla.org/firefox/downloads/file/4573289/ublock_origin-1.6… + sha256sum: 190297f3d1e55db0c65f9bc00460bea9b753939d428ea593d6cef27fde1ce69a + - URL: https://addons.mozilla.org/firefox/downloads/file/4578681/ublock_origin-1.6… name: ublock-origin - sha256sum: 155820bace5bf7c8ba547e27678a4a25251131c54904f02f5bf340996f6fdbdc + sha256sum: bc62cd930601212f1568964389352bbd4b1808466f2c9ac1198c754338077fb0 enable: '[% c("var/mullvad-browser") %]' - - URL: https://cdn.mullvad.net/browser-extension/0.9.4/mullvad-browser-extension-0… + - URL: https://cdn.mullvad.net/browser-extension/0.9.5/mullvad-browser-extension-0… name: mullvad-extension - sha256sum: c91fcf30fe9a998f45ddc92e083bca4cd7b6dbb24fc545391e155ed1ec13c8cb + sha256sum: c36f8d5447300621579f7f1408a25f25dac3929c867e7ae5db9fc8b82e80a4e9 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/translation/config ===================================== @@ -12,7 +12,7 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 8b24f7d9a827310d098c0af318bf2532424a1762 + git_hash: 98613b882f468da022301d164e619c6083fd0055 targets: nightly: git_hash: 'base-browser' ===================================== rbm.conf ===================================== @@ -77,7 +77,7 @@ var: torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/10/07 12:00:00' + browser_release_date: '2025/10/13 14:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_default_channel: release browser_platforms: @@ -132,8 +132,8 @@ var: - 14.5.5 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' - torbrowser_legacy_version: 13.5.22 - torbrowser_legacy_platform_version: 115.28.0 + torbrowser_legacy_version: 13.5.23 + torbrowser_legacy_platform_version: 115.29.0 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5.23-build1
by Pier Angelo Vendrame (＠pierov) 13 Oct '25

13 Oct '25

Pier Angelo Vendrame pushed new tag tbb-13.5.23-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… 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 41581: Prepare Tor Browser 13.5.23.
by Pier Angelo Vendrame (＠pierov) 13 Oct '25

13 Oct '25

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 0729063d by Pier Angelo Vendrame at 2025-10-13T16:16:04+02:00 Bug 41581: Prepare Tor Browser 13.5.23. - - - - - 7 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/openssl/config - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,11 @@ +Tor Browser 13.5.23 - October 14 2025 + * All Platforms + * Updated Firefox to 115.29.0esr + * Updated Tor to 0.4.8.19 + * Updated NoScript to 13.2.1 + * Updated OpenSSL to 3.5.4 + * Bug 44255: Rebase Tor Browser legacy onto 115.29.0esr [tor-browser] + Tor Browser 13.5.22 - September 16 2025 * All Platforms * Updated Firefox to 115.28.0esr ===================================== projects/browser/config ===================================== @@ -103,9 +103,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4551629/noscript-13.0.9.x… + - URL: https://addons.mozilla.org/firefox/downloads/file/4593796/noscript-13.2.1.x… name: noscript - sha256sum: 525ab61aff21f67d10c3e20965a86ed479631549908a658f54692adc47d771f5 + sha256sum: 190297f3d1e55db0c65f9bc00460bea9b753939d428ea593d6cef27fde1ce69a - URL: https://addons.mozilla.org/firefox/downloads/file/4359936/ublock_origin-1.6… name: ublock-origin sha256sum: e2cda9b2a1b0a7f6e5ef0da9f87f28df52f8560587ba2e51a3003121cfb81600 ===================================== projects/firefox/config ===================================== @@ -16,12 +16,12 @@ container: use_container: 1 var: - firefox_platform_version: 115.28.0 + firefox_platform_version: 115.29.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 1 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.5.2 +version: 3.5.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -33,5 +33,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://github.com/openssl/openssl/releases/download/openssl-[% c("version") %]/openssl-[% c("version") %].tar.gz' - sha256sum: c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec + sha256sum: 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 name: openssl ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.17 +version: 0.4.8.19 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 0605fd89b582f841ff494213ace40558043593d7 + git_hash: 98613b882f468da022301d164e619c6083fd0055 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 0513af059216580b1e8159af3a808ab4a1b32f84 + git_hash: 29ad882c77961640cfe47caa172f544ce3b8bb1d targets: nightly: git_hash: 'tor-browser' ===================================== rbm.conf ===================================== @@ -73,11 +73,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.22' + torbrowser_version: '13.5.23' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/09/15 22:16:06' + browser_release_date: '2025/10/13 14:15:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_platforms: # is_android_release and is_desktop_release are used to quickly @@ -115,9 +115,9 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 13.5.22 - 13.5.21 - 13.5.20 - - 13.5.19 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41586: Replace Noto CJK with Jigmo on Linux.
by morgan (＠morgan) 13 Oct '25

13 Oct '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 43348a3b by Pier Angelo Vendrame at 2025-10-13T15:17:18+00:00 Bug 41586: Replace Noto CJK with Jigmo on Linux. - - - - - 2 changed files: - projects/fonts/build - projects/fonts/config Changes: ===================================== projects/fonts/build ===================================== @@ -28,8 +28,14 @@ mv noto-fonts-* noto-fonts [% IF c("var/linux") %] unzip "$rootdir/[% c('input_files_by_name/arimo') %]" + + mkdir jigmo + pushd jigmo + unzip "$rootdir/[% c('input_files_by_name/jigmo') %]" + popd + cp Arimo-*/fonts/ttf/*.ttf Cousine-* Tinos-* \ - NotoSans{JP,KR,SC,TC}-Regular.otf \ + jigmo/Jigmo*.ttf \ NotoColorEmoji.ttf \ $distdir/ [% END %] ===================================== projects/fonts/config ===================================== @@ -175,18 +175,9 @@ input_files: - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e… sha256sum: cf264a22292950ca1679b2ade07e9e6ecb26c649ab70975d0e113f979efa827a enable: '[% c("var/linux") %]' - # Noto Sans CJK Version 2.004 - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… - sha256sum: dff723ba59d57d136764a04b9b2d03205544f7cd785a711442d6d2d085ac5073 - enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… - sha256sum: 69975a0ac8472717870aefeab0a4d52739308d90856b9955313b2ad5e0148d68 - enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… - sha256sum: faa6c9df652116dde789d351359f3d7e5d2285a2b2a1f04a2d7244df706d5ea9 - enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… - sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537 + - URL: https://kamichikoichi.github.io/jigmo/Jigmo-20250912.zip + sha256sum: 5744c7386d129475d87607ca66d043c8793c65448adeaedc921b6931890e5d0b + name: jigmo enable: '[% c("var/linux") %]' - URL: https://github.com/googlefonts/noto-emoji/raw/b3e3051a088047d19fd4d49b1c3ac… sha256sum: 3ed77810c203e1a67735dc19d395f32c23f2d7c0c3696690f4f78e15e57ab816 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 44131: Move torrc-defaults creation to tor-expert-bundle
by brizental (＠brizental) 13 Oct '25

13 Oct '25

brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a635c2b6 by Beatriz Rizental at 2025-10-13T16:51:25+02:00 Bug 44131: Move torrc-defaults creation to tor-expert-bundle Related to tor-browser#44131 - - - - - 8 changed files: - − projects/browser/Bundle-Data/linux/Data/Tor/torrc - − projects/browser/Bundle-Data/mac/Contents/Resources/TorBrowser/Tor/torrc-defaults - − projects/browser/Bundle-Data/windows/Data/Tor/torrc - − projects/browser/Bundle-Data/windows/Data/Tor/torrc-defaults - projects/browser/build - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - projects/browser/Bundle-Data/linux/Data/Tor/torrc-defaults → projects/tor-expert-bundle/torrc-defaults Changes: ===================================== projects/browser/Bundle-Data/linux/Data/Tor/torrc deleted ===================================== ===================================== projects/browser/Bundle-Data/mac/Contents/Resources/TorBrowser/Tor/torrc-defaults deleted ===================================== @@ -1,15 +0,0 @@ -# torrc-defaults for Tor Browser -# -# DO NOT EDIT THIS FILE -# -# This file is distributed with Tor Browser and SHOULD NOT be modified (it -# may be overwritten during the next Tor Browser update). To customize your -# Tor configuration, shut down Tor Browser and edit the torrc file. -# -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Where to send logging messages. Format is minSeverity[-maxSeverity] -# (stderr|stdout|syslog|file FILENAME). -Log notice stdout -CookieAuthentication 1 -DormantCanceledByStartup 1 ===================================== projects/browser/Bundle-Data/windows/Data/Tor/torrc deleted ===================================== ===================================== projects/browser/Bundle-Data/windows/Data/Tor/torrc-defaults deleted ===================================== @@ -1,15 +0,0 @@ -# torrc-defaults for Tor Browser -# -# DO NOT EDIT THIS FILE -# -# This file is distributed with Tor Browser and SHOULD NOT be modified (it -# may be overwritten during the next Tor Browser update). To customize your -# Tor configuration, shut down Tor Browser and edit the torrc file. -# -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Where to send logging messages. Format is minSeverity[-maxSeverity] -# (stderr|stdout|syslog|file FILENAME). -Log notice stdout -CookieAuthentication 1 -DormantCanceledByStartup 1 ===================================== projects/browser/build ===================================== @@ -99,7 +99,13 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b # geoip(6) and anything else that belongs in the data dir from the expert bundle mkdir -p "$TBDIR/$TORCONFIGPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORCONFIGPATH"[% END %] - mv_tbdir data/{geoip,geoip6} "$TORCONFIGPATH" + mv_tbdir data/{geoip,geoip6,torrc-defaults} "$TORCONFIGPATH" + [% IF ! c("var/macos") %] + # Create an empty torrc file for user configurations. + # + # In MacOS this file is usually in the user directory, so we skip it there. + touch "$TBDIR/$TORCONFIGPATH"/torrc + [% END %] # pt_config.json will be consumed later in `bridges_conf` mv tor/pluggable_transports/pt_config.json $rootdir @@ -220,20 +226,6 @@ do [% END -%] done -[% IF c("var/tor-browser") -%] - PT_CONFIG="$rootdir/pt_config.json" - - # Write our ClientTransportPlugin lines to torrc-defults - for tbdir in "${TBDIRS[@]}" - do - PT_PATH='[% c("var/pt_path") %]' - TORRC_DEFAULTS="$tbdir/$TORCONFIGPATH/torrc-defaults" - jq --raw-output .pluggableTransports[] "${PT_CONFIG}" | while read -r line; do - echo "${line/\$\{pt_path\}/${PT_PATH}}" >> "$TORRC_DEFAULTS" - done - done -[% END -%] - [% IF c("var/linux") && c("var/tor-browser") %] chmod 700 "${TB_STAGE_DIR}/Browser/[% c('var/ProjectName') %]/Data/Browser" chmod 700 "${TB_STAGE_DIR}/Browser/TorBrowser/Data/Tor" ===================================== projects/tor-expert-bundle/build ===================================== @@ -71,6 +71,12 @@ cd $distdir cd .. [% END %] +# Write our ClientTransportPlugin lines to torrc-defults +jq --raw-output .pluggableTransports[] "tor/pluggable_transports/pt_config.json" | while read -r line; do + echo "${line/\$\{pt_path\}/[% c("var/pt_path") %]}" >> "$rootdir/torrc-defaults" +done +mv "$rootdir/torrc-defaults" data + [% SET tar_src = [ "tor", "data", "docs" ]; IF c("var/linux"); ===================================== projects/tor-expert-bundle/config ===================================== @@ -3,8 +3,15 @@ filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/buil version: '[% c("var/torbrowser_version") %]' targets: + linux: + var: + pt_path: ./TorBrowser/Tor/PluggableTransports/ + macos: + var: + pt_path: PluggableTransports/ windows: var: + pt_path: TorBrowser\Tor\PluggableTransports\ pt_extension: .exe input_files: @@ -16,6 +23,8 @@ input_files: project: conjure enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]' - filename: pt_config.json + - filename: torrc-defaults + enable: '[% !c("var/android") %]' - filename: AndroidManifest.xml enable: '[% c("var/android") %]' - filename: MANIFEST.MF ===================================== projects/browser/Bundle-Data/linux/Data/Tor/torrc-defaults → projects/tor-expert-bundle/torrc-defaults ===================================== 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/mullvad-browser][mullvad-browser-140.4.0esr-15.0-1] 4 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 13 Oct '25

13 Oct '25

morgan pushed to branch mullvad-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7476f64e by Henry Wilkes at 2025-10-13T14:47:17+00:00 fixup! Firefox preference overrides. TB 43850: Do not use automatic forced colours on Windows. - - - - - e2f05972 by Henry Wilkes at 2025-10-13T14:47:17+00:00 fixup! BB 42027: Base Browser migration procedures. TB 43850: Clear browser colour preferences if the user has RFP enabled. - - - - - 2c42fd20 by Henry Wilkes at 2025-10-13T14:47:18+00:00 fixup! Base Browser strings TB 43850: Add alternative name and description for the "Custom" contrast control. - - - - - 155f6482 by Henry Wilkes at 2025-10-13T14:47:18+00:00 BB 43850: Modify the Contrast Control settings for RFP. - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - browser/components/ProfileDataUpgrader.sys.mjs - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -544,7 +544,13 @@ pref("pdfjs.enableScripting", false); // tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable pref("pdfjs.disabled", false, locked); #endif -// Bug 40057: Ensure system colors are not used for CSS4 colors +// tor-browser#43850. Keep forced colors off by default for all platforms. +// Upstream sets a value of "0" for Windows. +pref("browser.display.document_color_use", 1); +// Bug 40057: Ensure system colors are not used for CSS4 colors. +// FIXME: This preference seems to be unread since bugzilla bug 1898096, but +// still exists in the static preference list. Remove when upstream removes +// this or confirms it will not be used again in the future. pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -914,7 +914,8 @@ export let ProfileDataUpgrader = { // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. // Version 4: 15.0a2: Drop ML components. tor-browser#44045. // Version 5: 15.0a3: Disable LaterRun using prefs. tor-browser#42630. - const MIGRATION_VERSION = 5; + // Version 6: 15.0a4: Reset browser colors. tor-browser#43850. + const MIGRATION_VERSION = 6; const MIGRATION_PREF = "basebrowser.migration.version"; if (isNewProfile) { @@ -982,6 +983,36 @@ export let ProfileDataUpgrader = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 6) { + // Clear the related preference that is no longer read by upstream's code. + Services.prefs.clearUserPref("browser.display.use_system_colors"); + if (Services.prefs.getBoolPref("privacy.resistFingerprinting", true)) { + for (const prefName of [ + // User has not switched off resist fingerprinting. We want to reset + // any "0" (automatic, use system colours) and "2" (always use browser + // colours) values. + // The "0" value cannot be set by the user under RFP in + // about:preferences. The "2" value can be set, but has a different + // name and a warning about website detectability. tor-browser#43850. + "browser.display.document_color_use", + // Under RFP, the following colours are ignored. So we clear them. + // NOTE: Only a subset of can be set via the colors.xhtml dialog in + // about:preferences. + "browser.anchor_color", + "browser.anchor_color.dark", + "browser.visited_color", + "browser.visited_color.dark", + "browser.display.foreground_color", + "browser.display.foreground_color.dark", + "browser.display.background_color", + "browser.display.background_color.dark", + "browser.active_color", + "browser.active_color.dark", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -264,6 +264,15 @@ value="2" flex="1" data-l10n-id="preferences-contrast-control-custom"/> + <description id="contrastSettingsFixedColorsDescription" class="indent"> + <html:span + data-l10n-id="preferences-contrast-control-fixed-color-description" + ></html:span> + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting" + ></html:a> + </description> <button id="colors" is="highlightable-button" class="accessory-button indent" ===================================== browser/components/preferences/main.js ===================================== @@ -733,6 +733,78 @@ var gMainPane = { gMainPane.updateColorsButton.bind(gMainPane) ); gMainPane.updateColorsButton(); + + // Modify the contrast setting options when resist fingerprinting (RFP) is + // enabled because the custom colours will not be used in this state. + // Instead, some fixed set of stand-in colours is used. tor-browser#43850. + const resistFingerprintingPref = "privacy.resistFingerprinting"; + const updateContrastControls = () => { + const rfpEnabled = Services.prefs.getBoolPref( + resistFingerprintingPref, + false + ); + const autoOptionEl = document.getElementById("contrastSettingsAuto"); + const onOptionEl = document.getElementById("contrastSettingsOn"); + const onDescriptionEl = document.getElementById( + "contrastSettingsFixedColorsDescription" + ); + const colorButtonEl = document.getElementById("colors"); + for (const { element, hide } of [ + { + element: autoOptionEl, + // Hide the "Automatic" option under RFP if it is not already + // selected. We generally want to discourage this reflection of system + // settings if RFP is enabled. + // NOTE: It would be unexpected for this value to be selected under + // RFP since there is no visible UI to do so in this state. It would + // likely require some direct preference manipulation. + hide: + rfpEnabled && + autoOptionEl.value !== + String( + Preferences.get("browser.display.document_color_use").value + ), + }, + { element: colorButtonEl, hide: rfpEnabled }, + { element: onDescriptionEl, hide: !rfpEnabled }, + ]) { + element.hidden = hide; + if (hide) { + element.setAttribute("data-hidden-from-search", "true"); + } else { + element.removeAttribute("data-hidden-from-search"); + } + } + if (rfpEnabled) { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-fixed-color" + ); + onOptionEl.setAttribute("aria-describedby", onDescriptionEl.id); + } else { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-custom" + ); + onOptionEl.removeAttribute("aria-describedby"); + } + }; + updateContrastControls(); + Services.prefs.addObserver( + resistFingerprintingPref, + updateContrastControls + ); + window.addEventListener( + "unload", + () => { + Services.prefs.removeObserver( + resistFingerprintingPref, + updateContrastControls + ); + }, + { once: true } + ); + Preferences.get("layers.acceleration.disabled").on( "change", gMainPane.updateHardwareAcceleration.bind(gMainPane) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -101,6 +101,13 @@ letterboxing-enable-button = browser-layout-show-sidebar-desc-limited = Quickly access bookmarks and more without leaving your main view. +## Preferences - Contrast Control. + +preferences-contrast-control-fixed-color = + .label = Fixed colors + .accesskey = F +preferences-contrast-control-fixed-color-description = This will be detectable by websites and will make you appear more unique to web trackers. + ## Security level toolbar button. ## Uses sentence case in English (US). ## ".label" is the accessible name, and shown in the overflow menu and when customizing the toolbar. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/5a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/5a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.4.0esr-15.0-1] 4 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 13 Oct '25

13 Oct '25

morgan pushed to branch base-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 8f0da14a by Henry Wilkes at 2025-10-13T14:45:19+00:00 fixup! Firefox preference overrides. TB 43850: Do not use automatic forced colours on Windows. - - - - - c6268111 by Henry Wilkes at 2025-10-13T14:45:19+00:00 fixup! BB 42027: Base Browser migration procedures. TB 43850: Clear browser colour preferences if the user has RFP enabled. - - - - - 687cbb65 by Henry Wilkes at 2025-10-13T14:45:20+00:00 fixup! Base Browser strings TB 43850: Add alternative name and description for the "Custom" contrast control. - - - - - 9f7ddf7e by Henry Wilkes at 2025-10-13T14:45:20+00:00 BB 43850: Modify the Contrast Control settings for RFP. - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - browser/components/ProfileDataUpgrader.sys.mjs - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -544,7 +544,13 @@ pref("pdfjs.enableScripting", false); // tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable pref("pdfjs.disabled", false, locked); #endif -// Bug 40057: Ensure system colors are not used for CSS4 colors +// tor-browser#43850. Keep forced colors off by default for all platforms. +// Upstream sets a value of "0" for Windows. +pref("browser.display.document_color_use", 1); +// Bug 40057: Ensure system colors are not used for CSS4 colors. +// FIXME: This preference seems to be unread since bugzilla bug 1898096, but +// still exists in the static preference list. Remove when upstream removes +// this or confirms it will not be used again in the future. pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -914,7 +914,8 @@ export let ProfileDataUpgrader = { // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. // Version 4: 15.0a2: Drop ML components. tor-browser#44045. // Version 5: 15.0a3: Disable LaterRun using prefs. tor-browser#42630. - const MIGRATION_VERSION = 5; + // Version 6: 15.0a4: Reset browser colors. tor-browser#43850. + const MIGRATION_VERSION = 6; const MIGRATION_PREF = "basebrowser.migration.version"; if (isNewProfile) { @@ -982,6 +983,36 @@ export let ProfileDataUpgrader = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 6) { + // Clear the related preference that is no longer read by upstream's code. + Services.prefs.clearUserPref("browser.display.use_system_colors"); + if (Services.prefs.getBoolPref("privacy.resistFingerprinting", true)) { + for (const prefName of [ + // User has not switched off resist fingerprinting. We want to reset + // any "0" (automatic, use system colours) and "2" (always use browser + // colours) values. + // The "0" value cannot be set by the user under RFP in + // about:preferences. The "2" value can be set, but has a different + // name and a warning about website detectability. tor-browser#43850. + "browser.display.document_color_use", + // Under RFP, the following colours are ignored. So we clear them. + // NOTE: Only a subset of can be set via the colors.xhtml dialog in + // about:preferences. + "browser.anchor_color", + "browser.anchor_color.dark", + "browser.visited_color", + "browser.visited_color.dark", + "browser.display.foreground_color", + "browser.display.foreground_color.dark", + "browser.display.background_color", + "browser.display.background_color.dark", + "browser.active_color", + "browser.active_color.dark", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, }; ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -264,6 +264,15 @@ value="2" flex="1" data-l10n-id="preferences-contrast-control-custom"/> + <description id="contrastSettingsFixedColorsDescription" class="indent"> + <html:span + data-l10n-id="preferences-contrast-control-fixed-color-description" + ></html:span> + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting" + ></html:a> + </description> <button id="colors" is="highlightable-button" class="accessory-button indent" ===================================== browser/components/preferences/main.js ===================================== @@ -733,6 +733,78 @@ var gMainPane = { gMainPane.updateColorsButton.bind(gMainPane) ); gMainPane.updateColorsButton(); + + // Modify the contrast setting options when resist fingerprinting (RFP) is + // enabled because the custom colours will not be used in this state. + // Instead, some fixed set of stand-in colours is used. tor-browser#43850. + const resistFingerprintingPref = "privacy.resistFingerprinting"; + const updateContrastControls = () => { + const rfpEnabled = Services.prefs.getBoolPref( + resistFingerprintingPref, + false + ); + const autoOptionEl = document.getElementById("contrastSettingsAuto"); + const onOptionEl = document.getElementById("contrastSettingsOn"); + const onDescriptionEl = document.getElementById( + "contrastSettingsFixedColorsDescription" + ); + const colorButtonEl = document.getElementById("colors"); + for (const { element, hide } of [ + { + element: autoOptionEl, + // Hide the "Automatic" option under RFP if it is not already + // selected. We generally want to discourage this reflection of system + // settings if RFP is enabled. + // NOTE: It would be unexpected for this value to be selected under + // RFP since there is no visible UI to do so in this state. It would + // likely require some direct preference manipulation. + hide: + rfpEnabled && + autoOptionEl.value !== + String( + Preferences.get("browser.display.document_color_use").value + ), + }, + { element: colorButtonEl, hide: rfpEnabled }, + { element: onDescriptionEl, hide: !rfpEnabled }, + ]) { + element.hidden = hide; + if (hide) { + element.setAttribute("data-hidden-from-search", "true"); + } else { + element.removeAttribute("data-hidden-from-search"); + } + } + if (rfpEnabled) { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-fixed-color" + ); + onOptionEl.setAttribute("aria-describedby", onDescriptionEl.id); + } else { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-custom" + ); + onOptionEl.removeAttribute("aria-describedby"); + } + }; + updateContrastControls(); + Services.prefs.addObserver( + resistFingerprintingPref, + updateContrastControls + ); + window.addEventListener( + "unload", + () => { + Services.prefs.removeObserver( + resistFingerprintingPref, + updateContrastControls + ); + }, + { once: true } + ); + Preferences.get("layers.acceleration.disabled").on( "change", gMainPane.updateHardwareAcceleration.bind(gMainPane) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -101,6 +101,13 @@ letterboxing-enable-button = browser-layout-show-sidebar-desc-limited = Quickly access bookmarks and more without leaving your main view. +## Preferences - Contrast Control. + +preferences-contrast-control-fixed-color = + .label = Fixed colors + .accesskey = F +preferences-contrast-control-fixed-color-description = This will be detectable by websites and will make you appear more unique to web trackers. + ## Security level toolbar button. ## Uses sentence case in English (US). ## ".label" is the accessible name, and shown in the overflow menu and when customizing the toolbar. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0b4709… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0b4709… 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 41373: Remove `_ALL` from mar filenames
by boklm (＠boklm) 13 Oct '25

13 Oct '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 610da963 by Nicolas Vigier at 2025-10-13T16:29:54+02:00 Bug 41373: Remove `_ALL` from mar filenames - - - - - 98191f15 by Nicolas Vigier at 2025-10-13T16:29:55+02:00 Bug 41373: Add support for old from mar filenames (with `_ALL`) We need to keep supporting old mar filenames for: - generating incrementals from releases with the old filenames - generating update responses for releases with the old filenames, for the legacy channel We should revert this commit when support for the legacy channel (13.5) has ended. - - - - - 4 changed files: - projects/browser/build - tools/count-mar-downloads - tools/dmg2mar - tools/update-responses/update_responses Changes: ===================================== projects/browser/build ===================================== @@ -372,7 +372,7 @@ cd $distdir [% IF c("var/build_mar") && c("var/updater_enabled") -%] # Create full MAR file and compressed package. - [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_ALL.mar' %] + [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '.mar' %] MAR=$MARTOOLS/mar \ MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ MAR_CHANNEL_ID=[% c("var/mar_channel_id") %] \ ===================================== tools/count-mar-downloads ===================================== @@ -63,7 +63,7 @@ sub parse_log_file { my ($stdout, undef, $success) = capture_exec('xzcat', $File::Find::name); foreach my $line (split /\n/, $stdout) { my ($version, $os) = - ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)-\d.*_ALL\.mar HTTP/|); + ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)-\d.*(_ALL)?\.mar HTTP/|); if ($version) { $downloads{$version}{total} += 1; $downloads{$version}{full_update} += 1; @@ -72,7 +72,7 @@ sub parse_log_file { } my $incremental_from; ($version, $os, $incremental_from) = - ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)--(\d[^-]+)-.*_ALL\.incremental\.mar HTTP/|); + ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)--(\d[^-]+)-.*(_ALL)?\.incremental\.mar HTTP/|); if ($incremental_from) { $downloads{$version}{total} += 1; $downloads{$version}{OS}{$os} += 1; ===================================== tools/dmg2mar ===================================== @@ -117,7 +117,7 @@ sub convert_files { print "Finished $_[2]\n"; }); foreach my $file (get_dmg_files_from_sha256sums) { - my $output = "$appname_mar-macos-$file->{version}_ALL.mar"; + my $output = "$appname_mar-macos-$file->{version}.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; ===================================== tools/update-responses/update_responses ===================================== @@ -87,6 +87,33 @@ sub get_sha512_hex_of_file { return $sha->hexdigest; } +# With release 15.0 _ALL is being removed from mar file names. +# However we need to be able to generate incrementals from versions +# using the old filenames. As a workaround, if the old filename is +# found we create a symlink to the new file name. +# The symlinks are used in `create_incremental_mar` and `get_buildinfos`, +# where supporting both file names would complexify things. The symlinks +# are ignored in `get_version_files` where the regexp used support both +# old and new filenames. +# We can remove this once we don't need to generate incrementals from +# versions with the old file names. +sub symlink_ALL { + my ($config, $version) = @_; + my $vdir = version_dir($config, $version); + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + if ($file =~ m/^(.+)_ALL\.mar$/) { + next if -f "$vdir/$1.mar"; + symlink $file, "$vdir/$1.mar"; + } + if ($file =~ m/^(.+)_ALL\.incremental\.mar$/) { + next if -f "$vdir/$1.incremental.mar"; + symlink $file, "$vdir/$1.incremental.mar"; + } + } +} + sub get_version_files { my ($config, $version) = @_; return if $config->{versions}{$version}{files}; @@ -97,8 +124,13 @@ sub get_version_files { opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; + # Ignore the symlinks created by `symlink_ALL` to avoid adding the files + # twice. + # We can remove this line once we don't need to support the legacy channel with + # with the old file names. + next if -l "$vdir/$file"; if ($file !~ m/incremental\.mar$/ && - $file =~ m/^$appname-(.+)-${version}_ALL\.mar$/) { + $file =~ m/^$appname-(.+)-${version}(_ALL)?\.mar$/) { my $os = $1; $files->{$os}{complete} = { type => 'complete', @@ -111,7 +143,7 @@ sub get_version_files { }; next; } - if ($file =~ m/^$appname-(.+)--(.+)-${version}_ALL\.incremental\.mar$/) { + if ($file =~ m/^$appname-(.+)--(.+)-${version}(_ALL)?\.incremental\.mar$/) { my ($os, $from_version) = ($1, $2); $files->{$os}{partial}{$from_version} = { type => 'partial', @@ -221,13 +253,13 @@ sub extract_mar { sub mar_filename { my ($config, $appname, $version, $os) = @_; - version_dir($config, $version) . "/$appname-$os-${version}_ALL.mar"; + version_dir($config, $version) . "/$appname-$os-${version}.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $channel) = @_; my $appname = $config->{appname_marfile}; - my $mar_file = "$appname-$os--${from_version}-${new_version}_ALL.incremental.mar"; + my $mar_file = "$appname-$os--${from_version}-${new_version}.incremental.mar"; my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; @@ -288,6 +320,7 @@ sub create_incremental_mars_for_version { my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { $config->{versions}{$from_version} //= {}; + symlink_ALL($config, $from_version); get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { @@ -396,6 +429,7 @@ sub write_responses { my (%oses, %from_versions); foreach my $version (@$versions) { get_version_files($config, $version); + symlink_ALL($config, $version); get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { 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.4.0esr-15.0-1] 4 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 13 Oct '25

13 Oct '25

morgan pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 6b86c2c8 by Henry Wilkes at 2025-10-13T14:09:41+00:00 fixup! Firefox preference overrides. TB 43850: Do not use automatic forced colours on Windows. - - - - - 975e6f3a by Henry Wilkes at 2025-10-13T14:09:41+00:00 fixup! BB 42027: Base Browser migration procedures. TB 43850: Clear browser colour preferences if the user has RFP enabled. - - - - - 5756a349 by Henry Wilkes at 2025-10-13T14:09:41+00:00 fixup! Base Browser strings TB 43850: Add alternative name and description for the "Custom" contrast control. - - - - - 385a9630 by Henry Wilkes at 2025-10-13T14:09:42+00:00 BB 43850: Modify the Contrast Control settings for RFP. - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - browser/components/ProfileDataUpgrader.sys.mjs - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -544,7 +544,13 @@ pref("pdfjs.enableScripting", false); // tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable pref("pdfjs.disabled", false, locked); #endif -// Bug 40057: Ensure system colors are not used for CSS4 colors +// tor-browser#43850. Keep forced colors off by default for all platforms. +// Upstream sets a value of "0" for Windows. +pref("browser.display.document_color_use", 1); +// Bug 40057: Ensure system colors are not used for CSS4 colors. +// FIXME: This preference seems to be unread since bugzilla bug 1898096, but +// still exists in the static preference list. Remove when upstream removes +// this or confirms it will not be used again in the future. pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -914,7 +914,8 @@ export let ProfileDataUpgrader = { // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. // Version 4: 15.0a2: Drop ML components. tor-browser#44045. // Version 5: 15.0a3: Disable LaterRun using prefs. tor-browser#42630. - const MIGRATION_VERSION = 5; + // Version 6: 15.0a4: Reset browser colors. tor-browser#43850. + const MIGRATION_VERSION = 6; const MIGRATION_PREF = "basebrowser.migration.version"; if (isNewProfile) { @@ -982,6 +983,36 @@ export let ProfileDataUpgrader = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 6) { + // Clear the related preference that is no longer read by upstream's code. + Services.prefs.clearUserPref("browser.display.use_system_colors"); + if (Services.prefs.getBoolPref("privacy.resistFingerprinting", true)) { + for (const prefName of [ + // User has not switched off resist fingerprinting. We want to reset + // any "0" (automatic, use system colours) and "2" (always use browser + // colours) values. + // The "0" value cannot be set by the user under RFP in + // about:preferences. The "2" value can be set, but has a different + // name and a warning about website detectability. tor-browser#43850. + "browser.display.document_color_use", + // Under RFP, the following colours are ignored. So we clear them. + // NOTE: Only a subset of can be set via the colors.xhtml dialog in + // about:preferences. + "browser.anchor_color", + "browser.anchor_color.dark", + "browser.visited_color", + "browser.visited_color.dark", + "browser.display.foreground_color", + "browser.display.foreground_color.dark", + "browser.display.background_color", + "browser.display.background_color.dark", + "browser.active_color", + "browser.active_color.dark", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -264,6 +264,15 @@ value="2" flex="1" data-l10n-id="preferences-contrast-control-custom"/> + <description id="contrastSettingsFixedColorsDescription" class="indent"> + <html:span + data-l10n-id="preferences-contrast-control-fixed-color-description" + ></html:span> + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting" + ></html:a> + </description> <button id="colors" is="highlightable-button" class="accessory-button indent" ===================================== browser/components/preferences/main.js ===================================== @@ -733,6 +733,78 @@ var gMainPane = { gMainPane.updateColorsButton.bind(gMainPane) ); gMainPane.updateColorsButton(); + + // Modify the contrast setting options when resist fingerprinting (RFP) is + // enabled because the custom colours will not be used in this state. + // Instead, some fixed set of stand-in colours is used. tor-browser#43850. + const resistFingerprintingPref = "privacy.resistFingerprinting"; + const updateContrastControls = () => { + const rfpEnabled = Services.prefs.getBoolPref( + resistFingerprintingPref, + false + ); + const autoOptionEl = document.getElementById("contrastSettingsAuto"); + const onOptionEl = document.getElementById("contrastSettingsOn"); + const onDescriptionEl = document.getElementById( + "contrastSettingsFixedColorsDescription" + ); + const colorButtonEl = document.getElementById("colors"); + for (const { element, hide } of [ + { + element: autoOptionEl, + // Hide the "Automatic" option under RFP if it is not already + // selected. We generally want to discourage this reflection of system + // settings if RFP is enabled. + // NOTE: It would be unexpected for this value to be selected under + // RFP since there is no visible UI to do so in this state. It would + // likely require some direct preference manipulation. + hide: + rfpEnabled && + autoOptionEl.value !== + String( + Preferences.get("browser.display.document_color_use").value + ), + }, + { element: colorButtonEl, hide: rfpEnabled }, + { element: onDescriptionEl, hide: !rfpEnabled }, + ]) { + element.hidden = hide; + if (hide) { + element.setAttribute("data-hidden-from-search", "true"); + } else { + element.removeAttribute("data-hidden-from-search"); + } + } + if (rfpEnabled) { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-fixed-color" + ); + onOptionEl.setAttribute("aria-describedby", onDescriptionEl.id); + } else { + onOptionEl.setAttribute( + "data-l10n-id", + "preferences-contrast-control-custom" + ); + onOptionEl.removeAttribute("aria-describedby"); + } + }; + updateContrastControls(); + Services.prefs.addObserver( + resistFingerprintingPref, + updateContrastControls + ); + window.addEventListener( + "unload", + () => { + Services.prefs.removeObserver( + resistFingerprintingPref, + updateContrastControls + ); + }, + { once: true } + ); + Preferences.get("layers.acceleration.disabled").on( "change", gMainPane.updateHardwareAcceleration.bind(gMainPane) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -101,6 +101,13 @@ letterboxing-enable-button = browser-layout-show-sidebar-desc-limited = Quickly access bookmarks and more without leaving your main view. +## Preferences - Contrast Control. + +preferences-contrast-control-fixed-color = + .label = Fixed colors + .accesskey = F +preferences-contrast-control-fixed-color-description = This will be detectable by websites and will make you appear more unique to web trackers. + ## Security level toolbar button. ## Uses sentence case in English (US). ## ".label" is the accessible name, and shown in the overflow menu and when customizing the toolbar. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f0d854… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f0d854… You're receiving this email because of your account on gitlab.torproject.org.

1 0