[tbb-commits] [tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.

[mikeperry at torproject.org]

commit e2b23e56513bb5b02d020852fde54c3ee6c0b726
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jun 24 22:02:42 2015 -0700

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    Temporarily disable HTTP/2 pending audit.
---
 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 da69e6e..596d925 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -104,8 +104,11 @@ pref("security.enable_tls_session_tickets", false);
 pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable)
 pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case
 pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case
+pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case
 pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation
 pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562
+pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review
+pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review
 
 // Proxy and proxy security
 pref("network.proxy.socks", "127.0.0.1");