[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.

[mikeperry at torproject.org]

commit 1a6eb58a1d3cab67e371ac861d04ba526d4e6751
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 14 10:31:39 2015 +0000

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    We remove the keep-alive restriction now that we have isolation to the
    URL bar domain which is governing this as well (see: bug 4100).
---
 browser/app/profile/000-tor-browser.js |    1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 13bcf8e..192159b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -132,7 +132,6 @@ pref("network.http.pipelining.maxrequests", 12);
 pref("network.http.pipelining.ssl", true);
 pref("network.http.proxy.pipelining", true);
 pref("security.ssl.enable_false_start", true);
-pref("network.http.keep-alive.timeout", 20);
 pref("network.http.connection-retry-timeout", 0);
 pref("network.http.max-persistent-connections-per-proxy", 256);
 pref("network.http.pipelining.reschedule-timeout", 15000);