commit b274fac98f1387d97851f35d1ed1f86053f9b86c Author: Mike Perry mikeperry-git@fscked.org Date: Sun May 20 19:32:12 2012 -0700

Bug 5758: Last ditch effort to keep Torbutton diehards safe --- src/chrome/content/torbutton.js | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9e519d5..653a777 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1960,6 +1960,14 @@ function torbutton_update_status(mode, force_update) { return; }

+ // #5758: Last ditch effort to keep Vanilla Torbutton users from totally + // being pwnt. This is a pretty darn ugly hack, too. But because of #5863, + // we really don't care about preserving the user's values for this. + if (!m_tb_tbb) { + m_tb_prefs.setBoolPref("network.websockets.enabled", false); + m_tb_prefs.setBoolPref("dom.indexedDB.enabled", false); + } + torbutton_set_timezone(mode, false);

// This call also has to be here for 3rd party proxy changers.