[tbb-commits] [torbutton/master] Bug 13366: Fix cert exemption dialog when disk storage is enabled.

[mikeperry at torproject.org]

commit 32cb8c1dc8684b179f954c1299f2fadf564175d7
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Oct 8 13:23:39 2014 -0700

    Bug 13366: Fix cert exemption dialog when disk storage is enabled.
---
 src/CHANGELOG                   |    1 +
 src/chrome/content/torbutton.js |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 0d68ab6..44b8999 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -4,6 +4,7 @@
  * Bug 13138: ESR31-about:tor shows "Tor is not working"
  * Bug 12947: Adapt session storage blocker to ESR 31.
  * Bug 10716: Take care of drag/drop events in ESR 31.
+ * Bug 13366: Fix cert exemption dialog when disk storage is enabled.
 
 1.6.12.3
  23 Sep 2014
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index ca52fa9..ffea83b 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1984,6 +1984,8 @@ function torbutton_update_disk_prefs() {
     m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode);
     m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode);
 
+    m_tb_prefs.setBoolPref("security.nocertdb", mode);
+
     // No way to clear this beast during New Identity. Leave it off.
     //m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode);