[tor-commits] [tor-browser-bundle/master] Bug 11552: Back out HTTPS-Everywhere version bump.

[gk at torproject.org]

commit ef1ac0c2de37bc8e66e078584424492c29f31e7a
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 18 20:06:30 2014 +0000

    Bug 11552: Back out HTTPS-Everywhere version bump.
    
    Testing on Linux as well would be a good idea in the future...
---
 gitian/versions         |    3 ++-
 gitian/versions.alpha   |    3 ++-
 gitian/versions.beta    |    3 ++-
 gitian/versions.nightly |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index addcb3b..3c82a79 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -9,7 +9,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
 TOR_TAG=tor-0.2.4.21
 TORLAUNCHER_TAG=0.2.4.4
 TORBUTTON_TAG=1.6.7.0
-HTTPSE_TAG=3.5
+# XXX: 3.5 requires python2.7, see #11556
+HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 56192a8..ae1fcb8 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.5.3-alpha
 TORLAUNCHER_TAG=0.2.5.3
 TORBUTTON_TAG=1.6.8.1
-HTTPSE_TAG=3.5
+# XXX: 3.5 requires python2.7, see #11556
+HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 95e7235..bf2030e 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.4.21
 TORLAUNCHER_TAG=0.2.5.3
 TORBUTTON_TAG=1.6.8.1
-HTTPSE_TAG=3.5
+# XXX: 3.5 requires python2.7, see #11556
+HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 74455b6..f483670 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1
 TOR_TAG=master
 TORLAUNCHER_TAG=master
 TORBUTTON_TAG=master
-HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7
+# XXX: Master and 3.5 require python2.7, see #11556
+HTTPSE_TAG=3.4.5
 NSIS_TAG=master
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable