henry pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c92588e8 by Henry Wilkes at 2026-06-08T16:06:41+00:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45018: Add resistFingerprinting settings prior to importing other modules. Also, remove a stray "resistFingeprinting" Setting definition in privacy.mjs that should have been removed in the 152 rebase. - - - - - 2 changed files: - browser/components/preferences/config/privacy.mjs - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/config/privacy.mjs ===================================== @@ -3580,11 +3580,6 @@ Preferences.addSetting({ }, }); -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "resistFingerprintingPBM", pref: "privacy.resistFingerprinting.pbmode", ===================================== browser/components/preferences/main.js ===================================== @@ -39,6 +39,16 @@ ChromeUtils.defineESModuleGetters(this, { "resource://autofill/FormAutofillPreferences.sys.mjs", }); +// Rather than add "privacy.resistFingerprinting" preference and the +// "resistFingerprinting" Setting in privacy.mjs, we add them early *prior* to +// importing any config/ modules which require it. +// See tor-browser#44630 and tor-browser#45018. +Preferences.add({ id: "privacy.resistFingerprinting", type: "bool" }); +Preferences.addSetting({ + id: "resistFingerprinting", + pref: "privacy.resistFingerprinting", +}); + ChromeUtils.importESModule( "chrome://browser/content/preferences/config/accessibility.mjs", { global: "current" } @@ -93,10 +103,6 @@ function canShowAiFeature(featureSetting, defaultSetting) { } Preferences.addAll([ - // Rather than add "privacy.resistFingerprinting" in privacy.js, we add it - // early so we can define the "resistFingerprinting" `Setting` in this file. - // See below. See tor-browser#44630. - { id: "privacy.resistFingerprinting", type: "bool" }, // Startup { id: "browser.startup.page", type: "int" }, { id: "browser.startup.windowsLaunchOnLogin.enabled", type: "bool" }, @@ -129,18 +135,6 @@ if (AppConstants.HAVE_SHELL_SERVICE) { ]); } -// Rather than add "resistFingerprinting" in privacy.js, we add it to the -// settings early so we can have it be part of the setting config's `deps` field -// early. See tor-browser#44630. -// In particular, `Setting.deps` is lazy set. For many settings, this will only -// be set *after* all settings have been added. However, for settings with a -// `setup` field, the `deps` value will be set during construction, so we need -// the corresponding dependency available prior to construction. -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "privateBrowsingAutoStart", pref: "browser.privatebrowsing.autostart", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c92588e8... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c92588e8... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help