commit 3dd8fa462d0813913e99c0ab3678bd839fece7d2 Author: Mike Perry mikeperry-git@torproject.org Date: Fri Oct 24 16:20:07 2014 -0700

fixup! TB4: Tor Browser's Firefox preference overrides.

Bug #13443: Prevent crashing on windows by disabling DirectShow. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 83b79b2..d8498b2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -172,6 +172,9 @@ pref("security.tls.version.max", 3); // POODLE hotfix: Disable SSLv3 pref("security.tls.version.min", 1);

+// Bug 13443: Disable DirectShow to prevent crashing on windows +pref("media.directshow.enabled", false); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif