[tbb-commits] [tor-browser-bundle/master] Enable meek-http-helper prefs that make the ALPN extension match.

[mikeperry at torproject.org]

commit 276e390fbd0aa2449675c55a477f337a0f2b78df
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Jul 24 10:07:38 2015 +0000

    Enable meek-http-helper prefs that make the ALPN extension match.
    
    https://trac.torproject.org/projects/tor/ticket/15512#comment:3
---
 Bundle-Data/PTConfigs/meek-http-helper-user.js |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js
index 23565d9..de2355c 100644
--- a/Bundle-Data/PTConfigs/meek-http-helper-user.js
+++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js
@@ -9,6 +9,14 @@ user_pref("browser.dom.window.dump.enabled", true);
 // https://trac.torproject.org/projects/tor/ticket/13442#comment:1
 user_pref("security.ssl.disable_session_identifiers", false);
 
+// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN
+// extension.
+// https://trac.torproject.org/projects/tor/ticket/15512
+user_pref("network.http.spdy.enabled", true);
+user_pref("network.http.spdy.enabled.http2", true);
+user_pref("network.http.spdy.enabled.http2draft", true);
+user_pref("network.http.spdy.enabled.v3-1", true);
+
 // Disable safe mode. In case of a crash, we don't want to prompt for a
 // safe-mode browser that has extensions disabled.
 // https://support.mozilla.org/en-US/questions/951221#answer-410562