commit 09f79a8e0a565d1cc60c2af21cbc442ad5a883bd Author: Mike Perry mikeperry-git@torproject.org Date: Wed Feb 18 16:41:22 2015 -0800

Changelog and tag bump for 4.0.4. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ gitian/versions | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 953ae64..2da5786 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 4.0.4 -- Feb 24 2015 + * All Platforms + * Update Firefox to 31.5.0esr + * Update OpenSSL to 1.0.1l + * Update NoScript to 2.6.9.14 + * Bug 14203: Prevent meek from displaying an extra update notification + * Bug 14849: Remove new NoScript menu option to make permissions permanent + * Bug 14851: Set NoScript pref to disable permanent permissions + Tor Browser 4.0.3 -- Jan 13 2015 * All Platforms * Update Firefox to 31.4.0esr diff --git a/gitian/versions b/gitian/versions index d9135d3..24a5f8e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,10 +1,10 @@ -TORBROWSER_VERSION=4.0.3 +TORBROWSER_VERSION=4.0.4 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

-FIREFOX_VERSION=31.4.0esr +FIREFOX_VERSION=31.5.0esr

TORBROWSER_UPDATE_CHANNEL=release

@@ -47,13 +47,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.2 +HTTPSE_VER=4.0.3 GO_VER=1.3.3

## 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.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.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 @@ -81,8 +81,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 -HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 +NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f +HTTPSE_HASH=30891fc7bd73213a4d8386c44fc53ab8037c9ec3d4b90caefbe6a7558ef7ac2c MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4