[tbb-commits] [tor-browser-bundle/maint-4.0] TBB 4.0.6: Update changelog, versions, and update manifest.

[mikeperry at torproject.org]

commit a3798c52a08555e61782bc80d0e8935f4a8a7a0b
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Mar 25 21:48:24 2015 -0700

    TBB 4.0.6: Update changelog, versions, and update manifest.
    
    Because 4.0.5 and 4.0.6 were so close together, let's make incrementals from
    both 4.0.4 and 4.0.5.
---
 Bundle-Data/Docs/ChangeLog.txt    |    5 +++++
 gitian/versions                   |    8 ++++----
 tools/update-responses/config.yml |    9 +++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c8a2b5a..fa4b45d 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,8 @@
+Tor Browser 4.0.6 -- Mar 31 2015
+ * All Platforms
+   * Update Firefox to 31.6.0esr
+   * Update OpenSSL to 1.0.1m
+
 Tor Browser 4.0.5 -- Mar 23 2015
  * All Platforms
    * Update Firefox to 31.5.3esr
diff --git a/gitian/versions b/gitian/versions
index 14354af..d27d77c 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,10 +1,10 @@
-TORBROWSER_VERSION=4.0.5
+TORBROWSER_VERSION=4.0.6
 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.5.3esr
+FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
@@ -30,10 +30,10 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 
 GITIAN_TAG=tor-browser-builder-3.x-7
 
-OPENSSL_VER=1.0.1l
+OPENSSL_VER=1.0.1m
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=4.9.1
 PYTHON_VER=2.7.5
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 93a372f..682f5cc 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -6,15 +6,16 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    release: 4.0.5
+    release: 4.0.6
     alpha: 4.5-alpha-2
 versions:
-    4.0.5:
-        platformVersion: 31.5.3
+    4.0.6:
+        platformVersion: 31.6.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/4.0.5
+        download_url: https://www.torproject.org/dist/torbrowser/4.0.6
         incremental_from:
             - 4.0.4
+            - 4.0.5
     4.5-alpha-2:
         platformVersion: 31.3.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en