[tor-commits] [tor-browser-bundle/maint-5.5] Release preparations

[gk at torproject.org]

commit 71f272dcdb00007e9314cfef907ad092ad372b8d
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Feb 2 12:47:29 2016 +0000

    Release preparations
---
 Bundle-Data/Docs/ChangeLog.txt    | 8 ++++++++
 gitian/versions                   | 2 +-
 tools/update-responses/config.yml | 9 +++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index dcd0398..286b370 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,11 @@
+Tor Browser 5.5.1 -- February 4 2016
+ * All Platforms
+   * Bug 18168: Don't clear an iframe's window.name (fix of #16620)
+   * Bug 18172: Add Emoji support
+   * Bug 18137: Add two new obfs4 default bridges
+ * Windows
+   * Bug 18169: Whitelist zh-CN UI font
+
 Tor Browser 5.5 -- January 26 2016
  * All Platforms
    * Update Firefox to 38.6.0esr
diff --git a/gitian/versions b/gitian/versions
index 47b981b..a3e9f2f 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -11,7 +11,7 @@ FIREFOX_VERSION=38.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2
 TOR_TAG=tor-0.2.7.6
 TORLAUNCHER_TAG=0.2.7.8
 TORBUTTON_TAG=1.9.4.3
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 362c146..470ee06 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -10,14 +10,15 @@ build_targets:
     osx64: Darwin_x86_64-gcc3
 channels:
     alpha: 5.5a6
-    release: 5.5
+    release: 5.5.1
 versions:
-    5.5:
+    5.5.1:
         platformVersion: 38.6.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-55-released
-        download_url: https://www.torproject.org/dist/torbrowser/5.5
+        detailsURL: https://blog.torproject.org/blog/tor-browser-551-released
+        download_url: https://www.torproject.org/dist/torbrowser/5.5.1
         incremental_from:
           - 5.0.7
+          - 5.5
         migrate_archs:
           osx32: osx64
         osx32: