[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r13273: Clear HTTP auth on Tor toggle. Disable browser.send_pings. M (in torbutton/trunk/src: chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW defaults/preferences)



Author: mikeperry
Date: 2008-01-25 04:02:25 -0500 (Fri, 25 Jan 2008)
New Revision: 13273

Modified:
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/preferences.xul
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
   torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
   torbutton/trunk/src/defaults/preferences/preferences.js
Log:

Clear HTTP auth on Tor toggle. Disable browser.send_pings.
Make Firefox warn before launching an external app handler if
Tor is enabled. Disable safebrowsing if Tor is enabled (it
does some requests in cleartext).



Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/content/preferences.js	2008-01-25 09:02:25 UTC (rev 13273)
@@ -209,6 +209,7 @@
     doc.getElementById('torbutton_setUagent').checked = o_torprefs.getBoolPref('set_uagent');
     doc.getElementById('torbutton_noReferer').checked = o_torprefs.getBoolPref('disable_referer');
     doc.getElementById('torbutton_spoofEnglish').checked = o_torprefs.getBoolPref('spoof_english');
+    doc.getElementById('torbutton_clearHttpAuth').checked = o_torprefs.getBoolPref('clear_http_auth');
     
 
     torbutton_prefs_set_field_attributes(doc);
@@ -259,6 +260,7 @@
     o_torprefs.setBoolPref('cookie_jars', doc.getElementById('torbutton_cookieJars').selected);
     o_torprefs.setBoolPref('dual_cookie_jars', doc.getElementById('torbutton_dualCookieJars').selected);
     o_torprefs.setBoolPref('disable_domstorage', doc.getElementById('torbutton_noDomStorage').checked);
+    o_torprefs.setBoolPref('clear_http_auth', doc.getElementById('torbutton_clearHttpAuth').checked);
 
     if(doc.getElementById('torbutton_shutdownGroup').selectedItem ==
             doc.getElementById('torbutton_noShutdown')) {

Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/content/preferences.xul	2008-01-25 09:02:25 UTC (rev 13273)
@@ -193,6 +193,9 @@
             <checkbox id="torbutton_noDomStorage" 
                    label="&torbutton.prefs.disable_domstorage;" 
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
+            <checkbox id="torbutton_clearHttpAuth" 
+                   label="&torbutton.prefs.clear_http_auth;" 
+                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
            </vbox>
           </tabpanel>
           <tabpanel id="shutdown">

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-01-25 09:02:25 UTC (rev 13273)
@@ -598,12 +598,35 @@
         m_tb_prefs.setBoolPref("network.http.use-cache", !mode);
     }
 
+    var children = m_tb_prefs.getChildList("network.protocol-handler.warn-external", 
+            new Object());
+    torbutton_log(2, 'Children: '+ children.length);
+    for(var i = 0; i < children.length; i++) {
+        torbutton_log(2, 'Children: '+ children[i]);
+        if(mode) {
+            m_tb_prefs.setBoolPref(children[i], mode);
+        } else {
+            if(m_tb_prefs.prefHasUserValue(children[i]))
+                m_tb_prefs.clearUserPref(children[i]);
+        }
+    }
+
     // Always block disk cache during Tor. We clear it on toggle, 
     // so no need to keep it around for someone to rifle through.
     m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode);
 
+    // I think this pref is evil (and also hidden from user configuration, 
+    // which makes it extra evil) and so therefore am disabling it 
+    // by fiat for both tor and non-tor. Basically, I'm not willing 
+    // to put the code in to allow it to be enabled until someone 
+    // complains that it breaks stuff.
+    m_tb_prefs.setBoolPref("browser.send_pings", false);
+
     // Always, always disable remote "safe browsing" lookups.
     m_tb_prefs.setBoolPref("browser.safebrowsing.remoteLookups", false);
+   
+    // Disable safebrowsing in Tor. It fetches some info in cleartext 
+    m_tb_prefs.setBoolPref("browser.safebrowsing.enabled", !mode);
 
     if (torprefs.getBoolPref("no_search")) {
         m_tb_prefs.setBoolPref("browser.search.suggest.enabled", !mode);
@@ -660,12 +683,19 @@
         }
     }
 
+    
     torbutton_log(2, "Prefs pretty much done");
 
     // No need to clear cookies if just updating prefs
     if(!changed && force_update)
         return;
 
+    if(torprefs.getBoolPref('clear_http_auth')) {
+        var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"].
+        getService(Components.interfaces.nsIHttpAuthManager);
+        auth.clearAll();
+    }
+
     // Prevent tor cookies from being written to disk
     if(torprefs.getBoolPref('clear_cookies') 
             || torprefs.getBoolPref('cookie_jars')) {
@@ -687,7 +717,6 @@
             || torprefs.getBoolPref('dual_cookie_jars')) {
         torbutton_jar_cookies(mode);
     }
-
 }
 
 function torbutton_open_prefs_dialog() {

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-01-25 09:02:25 UTC (rev 13273)
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.cookies              "Cookies">
 <!ENTITY torbutton.prefs.cache                "Cache">
 <!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
@@ -66,3 +66,4 @@
 <!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
 <!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">

Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js	2008-01-25 08:43:54 UTC (rev 13272)
+++ torbutton/trunk/src/defaults/preferences/preferences.js	2008-01-25 09:02:25 UTC (rev 13273)
@@ -72,6 +72,7 @@
 pref("extensions.torbutton.block_ntforms",false);
 pref("extensions.torbutton.startup",false);
 pref("extensions.torbutton.crashed",false);
+pref("extensions.torbutton.clear_http_auth",true);
 
 pref("extensions.torbutton.appname_override","Netscape");
 pref("extensions.torbutton.appversion_override","5.0 (Windows; en-US)");