[tor-commits] [tor-browser-bundle/master] Make 3.6.x officially the 'stable' series.

[mikeperry at torproject.org]

commit 1259ad85be7f7299b94da14f53f850d544b6cd12
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue May 6 05:23:47 2014 -0700

    Make 3.6.x officially the 'stable' series.
---
 gitian/versions |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index a410fff..c3faa7b 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,5 +1,6 @@
-TORBROWSER_VERSION=3.5.5-pre
-BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
+TORBROWSER_VERSION=3.6.1
+BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
+BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
@@ -7,17 +8,17 @@ FIREFOX_VERSION=24.5.0esr
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3
 TOR_TAG=tor-0.2.4.21
-TORLAUNCHER_TAG=0.2.4.4
-TORBUTTON_TAG=1.6.7.0
+TORLAUNCHER_TAG=0.2.5.4
+TORBUTTON_TAG=1.6.9.0
 HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.8
+OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.13
+FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5
@@ -37,11 +38,13 @@ M2CRYPTO_VER=0.21.1
 PY2EXE_VER=0.6.9
 SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
+HTTPSE_VER=3.5.1
 
 ## 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.8.20-fn+fx+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi
+HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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
@@ -67,7 +70,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1
+NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08
+HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
@@ -88,6 +92,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_P
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
+HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE}
 PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE}
 PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}