[tor-commits] [tor-browser-bundle/master] Bump NoScript and Tor versions.

[mikeperry at torproject.org]

commit 45180fdb5a647c13f7192e91e8d63370e860d4b9
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Oct 24 16:54:30 2014 -0700

    Bump NoScript and Tor versions.
---
 Bundle-Data/Docs/ChangeLog.txt |    2 ++
 gitian/versions                |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 92a060b..fe53b58 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,5 +1,7 @@
 Tor Browser 4.0.1 -- Oct 30 2014
  * All Platforms
+   * Update Tor to 0.2.5.10
+   * Update NoScript to 2.6.9.3
    * Bug 13301: Prevent extensions incompatibility error after upgrades
    * Bug 13460: Fix MSVC compilation issue
  * Windows
diff --git a/gitian/versions b/gitian/versions
index a24f492..5db0e5d 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -9,7 +9,7 @@ FIREFOX_VERSION=31.2.0esr
 TORBROWSER_UPDATE_CHANNEL=release
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1
-TOR_TAG=tor-0.2.5.8-rc
+TOR_TAG=tor-0.2.5.10
 TORLAUNCHER_TAG=0.2.7.0.1
 TORBUTTON_TAG=1.7.0.1
 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.1-fn+fx+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-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=92bfa1f8a5673ffc82fe54db43c5f410c1cf403e38b82780f01eeeeae8233d0b
+NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a
 HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c