[tbb-commits] [tor-browser-bundle/maint-6.0] Release preparations for 6.0.5

[gk at torproject.org]

commit b071421fa87b8f75bd6447b5cadf3288918c1fbd
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Sep 7 09:01:19 2016 +0000

    Release preparations for 6.0.5
    
    Changelog update, version bumps, and config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    | 20 ++++++++++++++++++++
 gitian/versions                   | 10 +++++-----
 tools/update-responses/config.yml | 11 +++++------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 2bdf3e2..4000a57 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,23 @@
+Tor Browser 6.0.5 -- September 13
+ * All Platforms
+   * Update Firefox to 45.4.0esr
+   * Update Tor to 0.2.8.7
+   * Update Torbutton to 1.9.5.7
+     * Bug 18589: Clear site security settings during New Identity
+     * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times
+   * Update HTTPS-Everywhere to 5.2.4
+   * Bug 20092: Rotate ports for default obfs4 bridges
+   * Bug 20040: Add update support for unpacked HTTPS Everywhere
+ * Windows
+   * Bug 19725: Remove old updater files left on disk after upgrade to 6.x
+ * Linux
+   * Bug 19725: Remove old updater files left on disk after upgrade to 6.x
+ * Android
+   * Bug 19706: Store browser data in the app home directory
+ * Build system
+   * All platforms
+     * Upgrade Go to 1.4.3
+
 Tor Browser 6.0.4 -- August 16
  * All Platforms
    * Update Tor to 0.2.8.6
diff --git a/gitian/versions b/gitian/versions
index cb482cc..410b15b 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=45.3.0esr
+FIREFOX_VERSION=45.4.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2
-TOR_TAG=tor-0.2.8.6
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
+TOR_TAG=tor-0.2.8.7
 TORLAUNCHER_TAG=0.2.9.3
-TORBUTTON_TAG=1.9.5.6
-HTTPSE_TAG=5.2.1
+TORBUTTON_TAG=1.9.5.7
+HTTPSE_TAG=5.2.4
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index f20e9b1..d81d102 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -16,14 +16,13 @@ build_targets:
     osx64: Darwin_x86_64-gcc3
 channels:
     alpha: 6.5a2
-    release: 6.0.4
+    release: 6.0.5
 versions:
-    6.0.4:
-        platformVersion: 45.3.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-604-released
+    6.0.5:
+        platformVersion: 45.4.0
+        detailsURL: https://blog.torproject.org/blog/tor-browser-605-released
         incremental_from:
-          - 6.0.2
-          - 6.0.3
+          - 6.0.4
         migrate_archs:
           osx32: osx64
         osx32: