commit 9cc52477622b46fb76e0687a6d2f9770ccc8cf41 Author: Mike Perry <mikeperry-git@torproject.org> Date: Mon May 26 10:41:46 2014 -0700 Bug 11722: Add hidden pref to force remote Tor check Some users may not have access to their Tor control port, and would prefer a remote Tor check instead, even if they are not using a transproxy. This pref allows them to specify this. --- src/chrome/content/torbutton.js | 3 ++- src/defaults/preferences/preferences.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 79b01ce..43d5374 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1744,7 +1744,8 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. if (m_tb_control_port && - !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor")) { + !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful; else { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index bc63bb1..d2945c0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -26,6 +26,7 @@ pref("extensions.torbutton.socks_version",5); pref("extensions.torbutton.locked_mode",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); +pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions");