commit 59414cf80c23ba48eb18b021bcbd2a4e33997216 Author: Georg Koppen gk@torproject.org Date: Fri Jun 27 10:50:01 2014 +0000
HTTPS-E update and use NoScript RC in nightlies. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 6 +++--- gitian/versions.nightly | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 74e08b2..93cfb62 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * 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 Everyhwere to 3.5.3 * Script permissions now apply based on URL bar * Update Torbutton to 1.6.10.1 * Bug 12221: Remove obsolete Javascript components from the toggle era diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 71c4e44..479b6df 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha TORLAUNCHER_TAG=0.2.6.0 TORBUTTON_TAG=1.6.10.1 -HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=3.5.3 GO_VER=1.2
## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a429df7..13f49a3 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,13 +43,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=3.5.3 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_security_suite-2.6.8.28-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.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,8 +77,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -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://addons.cdn.mozilla.net/storage/public-staging/722/$%7BNOSCRIPT_PACKA... +NOSCRIPT_URL=https://secure.informaction.com/download/betas/$%7BNOSCRIPT_PACKAGE%7D 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