[tbb-commits] [tor-browser-bundle/hardened-builds] Bug 20290: Upgrade meek to 0.24.

[gk at torproject.org]

commit 40fd8cb1c914996adb817bf961ed23d1e5eb4856
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Oct 3 19:26:11 2016 -0700

    Bug 20290: Upgrade meek to 0.24.
    
    This version has a fix for https://bugs.torproject.org/20030.
    (meek-client-torbrowser failing to kill is subprocesses, which was a
    problem whenever meek-client-torbrowser was built with Go 1.6 or later.)
---
 gitian/versions         | 4 ++--
 gitian/versions.alpha   | 2 +-
 gitian/versions.nightly | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 6ab0f2d..d276d33 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -28,8 +28,8 @@ LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix
 FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
-GOPTLIB_TAG=0.2
-MEEK_TAG=0.20
+GOPTLIB_TAG=0.5
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e12110e..295439e 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -37,7 +37,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 99e476e..ab47af1 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.22-18371-3 #master
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd