[tor-commits] [tor-browser-bundle/maint-4.0] Prep 4.0.7 for Tor update.

[mikeperry at torproject.org]

commit 7a7f2b736c41882a6e9dbd6a911490771b5ea97a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Apr 6 23:52:09 2015 -0700

    Prep 4.0.7 for Tor update.
---
 Bundle-Data/Docs/ChangeLog.txt |    5 +++++
 gitian/versions                |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index e7707cb..eb89707 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,8 @@
+Tor Browser 4.0.7 -- Apr 9 2015
+ * All Platforms
+   * Update Tor to 0.2.5.12
+   * Update NoScript to 2.6.9.20
+
 Tor Browser 4.0.6 -- Mar 31 2015
  * All Platforms
    * Update Firefox to 31.6.0esr
diff --git a/gitian/versions b/gitian/versions
index 5d41491..7e280c5 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=4.0.6
+TORBROWSER_VERSION=4.0.7
 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
 BUILD_PT_BUNDLES=1
 
@@ -9,7 +9,7 @@ FIREFOX_VERSION=31.6.0esr
 TORBROWSER_UPDATE_CHANNEL=release
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1
-TOR_TAG=tor-0.2.5.11
+TOR_TAG=tor-0.2.5.12
 TORLAUNCHER_TAG=0.2.7.0.2
 TORBUTTON_TAG=1.7.0.2
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
@@ -53,7 +53,7 @@ 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.19-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.20-sm+fn+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
@@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad
+NOSCRIPT_HASH=daa2ac5e23728cd9d5fd39130673422b054b45d0d55237c08276e73fb3740bfe
 HTTPSE_HASH=30891fc7bd73213a4d8386c44fc53ab8037c9ec3d4b90caefbe6a7558ef7ac2c
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c