This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 7187cb8561e9 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js 7187cb8561e9 is described below

commit 7187cb8561e9fb3287e7b12aad3a73ee6335a20c Author: Richard Pospesel richard@torproject.org AuthorDate: Mon Oct 17 21:53:38 2022 +0000

fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js

Bug 40251: Clear obsolete prefs after torbutton!27 --- browser/app/profile/000-tor-browser.js | 13 ------------- 1 file changed, 13 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1a992d9681ad..65d6bc26a8b9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,20 +46,15 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo

// Display prefs pref("extensions.torbutton.display_circuit", true); -pref("extensions.torbutton@torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); -pref("extensions.torbutton.updateNeeded", false);

// Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.local_tor_check",true); -pref("extensions.torbutton.versioncheck_enabled",true); pref("extensions.torbutton.use_nontor_proxy",false);

// State prefs: pref("extensions.torbutton.startup",false); -pref("extensions.torbutton.inserted_button",false); -pref("extensions.torbutton.inserted_security_level",false);

// This is only used when letterboxing is disabled. // See #7255 for details. We display the warning three times to make sure the @@ -70,20 +65,12 @@ pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",false); -pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last -pref("extensions.torbutton.tor_memory_jar",false); -pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true);

-// Opt out of Firefox addon pings: -// https://developer.mozilla.org/en/Addons/Working_with_AMO -pref("extensions.torbutton@torproject.org.getAddons.cache.enabled", false); - // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false);

-pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true);

pref("extensions.torbutton.noscript_inited", false);