commit f61f4ae6641a47c76b1db1b85fb5633022fd44a2 Author: Mike Perry <mikeperry-git@fscked.org> Date: Mon May 21 16:29:22 2012 -0700 Bug 5863: Remove the ability to toggle Torbutton We'll leave the UI option to disable this there for one more release.. --- src/defaults/preferences/preferences.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 23db7c6..8c2ed3e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -22,7 +22,7 @@ pref("extensions.torbutton.gopher_port",0); pref("extensions.torbutton.socks_host",""); pref("extensions.torbutton.socks_port",0); pref("extensions.torbutton.socks_version",5); -pref("extensions.torbutton.locked_mode",false); +pref("extensions.torbutton.locked_mode",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on","127.0.0.1"); @@ -136,7 +136,7 @@ pref("extensions.torbutton.no_search",true); pref("extensions.torbutton.set_uagent",true); pref("extensions.torbutton.notor_sessionstore",true); pref("extensions.torbutton.nonontor_sessionstore",false); -pref("extensions.torbutton.restore_tor",false); +pref("extensions.torbutton.restore_tor",true); pref("extensions.torbutton.reload_crashed_jar",true); pref("extensions.torbutton.spoof_english",true); pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8');