[tor-browser-bundle/master] Use meek 0.9. Bump NoScript version. - tbb-commits

7 Jul 2014

commit 6ce9149bfbfb25b425465e3ed5ed0d0542790d04
Author: Georg Koppen gk@torproject.org
Date:   Mon Jul 7 09:17:51 2014 +0000
Use meek 0.9. Bump NoScript version.
---
 Bundle-Data/Docs/ChangeLog.txt |    6 +++---
 gitian/versions.alpha          |    8 ++++----
 gitian/versions.nightly        |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 1e2aecd..0ea1dc2 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,10 +1,10 @@
-Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014
+Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014
  * All Platforms
    * Include the Meek Pluggable Transport (version 0.9) (Bug 10935)
    * Update Tor to 0.2.5.5-alpha
-   * Update NoScript to 2.6.8.30rc4
-   * Update HTTPS Everywhere to 3.5.3
+   * Update NoScript to 2.6.8.31
      * Script permissions now apply based on URL bar
+   * Update HTTPS Everywhere to 3.5.3
    * Update Torbutton to 1.6.11.0
      * Bug 12221: Remove obsolete Javascript components from the toggle era
      * Bug 10819: Bind new third party isolation pref to Torbutton security UI
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index a724e48..425bbfd 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.8
+MEEK_TAG=0.9
GITIAN_TAG=tor-browser-builder-3.x-5
@@ -49,7 +49,7 @@ GO_VER=1.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.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
@@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208
+NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334
 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
@@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/$%7BTO
 OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_PACKAG...
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D
-NOSCRIPT_URL=https://secure.informaction.com/download/betas/$%7BNOSCRIPT_PACKAGE%7D
+NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/$%7BNOSCRIPT_PACKA...
 HTTPSE_URL=https://www.eff.org/files/$%7BHTTPSE_PACKAGE%7D
 PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 13f49a3..e129726 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -49,7 +49,7 @@ GO_VER=1.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.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
@@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208
+NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334
 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
@@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/$%7BTO
 OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_PACKAG...
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D
-NOSCRIPT_URL=https://secure.informaction.com/download/betas/$%7BNOSCRIPT_PACKAGE%7D
+NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/$%7BNOSCRIPT_PACKA...
 HTTPSE_URL=https://www.eff.org/files/$%7BHTTPSE_PACKAGE%7D
 PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D

    