[tbb-commits] [tor-browser-bundle/master] Update versions and changelog for OpenSSL 1.0.1n.

[mikeperry at torproject.org]

commit c110b4fa7b8be0d6c511698f4c6668901e235c14
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Jun 11 13:14:12 2015 -0700

    Update versions and changelog for OpenSSL 1.0.1n.
    
    Also bump Tor to 0.2.6.9.
---
 Bundle-Data/Docs/ChangeLog.txt |    4 +++-
 gitian/versions                |    6 +++---
 gitian/versions.alpha          |    4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index df35913..de9fb59 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,6 +2,7 @@ Tor Browser 5.0a2 -- June 12 2015
  * All Platforms
    * Update Tor to 0.2.7.1-alpha
    * Update HTTPS-Everywhere to 5.0.5
+   * Update OpenSSL to 1.0.1n
    * Update NoScript to 2.6.9.26
    * Update meek to 0.19
    * Update Torbutton to 1.9.2.7
@@ -19,8 +20,9 @@ Tor Browser 5.0a2 -- June 12 2015
 
 Tor Browser 4.5.2 -- June 12 2015
  * All Platforms
-   * Update Tor to 0.2.6.8
+   * Update Tor to 0.2.6.9
    * Update HTTPS-Everywhere to 5.0.5
+   * Update OpenSSL to 1.0.1n
    * Update NoScript to 2.6.9.26
    * Update Torbutton to 1.9.2.6
      * Bug 15984: Disabling Torbutton breaks the Add-ons Manager
diff --git a/gitian/versions b/gitian/versions
index 9c0aac1..e1bf555 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -9,7 +9,7 @@ FIREFOX_VERSION=31.7.0esr
 TORBROWSER_UPDATE_CHANNEL=release
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1
-TOR_TAG=tor-0.2.6.8
+TOR_TAG=tor-0.2.6.9
 TORLAUNCHER_TAG=0.2.7.5
 TORBUTTON_TAG=1.9.2.6
 HTTPSE_TAG=5.0.5
@@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5
 
 GITIAN_TAG=tor-browser-builder-3.x-8
 
-OPENSSL_VER=1.0.1m
+OPENSSL_VER=1.0.1n
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
@@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
+OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 2b2f6cd..d34f0af 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5
 
 GITIAN_TAG=tor-browser-builder-3.x-8
 
-OPENSSL_VER=1.0.1m
+OPENSSL_VER=1.0.1n
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
@@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
+OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645