[tor-commits] [tor-browser-bundle/master] Update versions files (alpha and stable) for 4.5.

[mikeperry at torproject.org]

commit 750efb38def19147d1c363ceb8738920784f0b48
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 21 20:02:26 2015 -0700

    Update versions files (alpha and stable) for 4.5.
---
 gitian/versions       |   29 +++++++++++++++++------------
 gitian/versions.alpha |   12 ++++++------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 3b74f27..653b4b1 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=31.2.0esr
+FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3
-TOR_TAG=tor-0.2.5.10
-TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.7.0.1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TOR_TAG=tor-0.2.6.7
+TORLAUNCHER_TAG=0.2.7.4
+TORBUTTON_TAG=1.9.2.0
 HTTPSE_TAG=5.0.2
-NSIS_TAG=v0.2
+NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
-MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ???
+MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ???
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
@@ -27,13 +27,18 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0
 GOPTLIB_TAG=0.2
 MEEK_TAG=0.17
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
+GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
+GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
+GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
+GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
+OBFS4_TAG=obfs4proxy-0.0.5
 
 GITIAN_TAG=tor-browser-builder-3.x-7
 
-OPENSSL_VER=1.0.1i
+OPENSSL_VER=1.0.1m
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=4.9.1
 PYTHON_VER=2.7.5
@@ -52,7 +57,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -74,12 +79,12 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7
+OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a
+NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 718019b..6419111 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,10 +8,10 @@ FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1
-TOR_TAG=tor-0.2.6.6
-TORLAUNCHER_TAG=0.2.7.3
-TORBUTTON_TAG=1.9.1.0
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TOR_TAG=tor-0.2.6.7
+TORLAUNCHER_TAG=0.2.7.4
+TORBUTTON_TAG=1.9.2.0
 HTTPSE_TAG=5.0.2
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
@@ -57,7 +57,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad
+NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4