[tbb-commits] [tor-browser-bundle/master] Update Tor Launcher to 0.2.6.2.

[mikeperry at torproject.org]

commit 2bddcb7a34689082da9a319121e412c4c94c8210
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 4 20:01:52 2014 -0700

    Update Tor Launcher to 0.2.6.2.
    
    Also add 3.6.4 changelog material into main changelog.
---
 Bundle-Data/Docs/ChangeLog.txt |   12 +++++++++++-
 gitian/versions.alpha          |    2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c3f872e..eccae14 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -14,11 +14,12 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014
      * Bug 12680: Change Torbutton URL in about dialog.
      * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap
      * Bug 9531: Workaround to avoid rare hangs during New Identity
-   * Update Tor Launcher to 0.2.6.1
+   * Update Tor Launcher to 0.2.6.2
      * Bug 11199: Improve behavior if tor exits
      * Bug 12451: Add option to hide TBB's logo
      * Bug 11193: Change "Tor Browser Bundle" to "Tor Browser"
      * Bug 11471: Ensure text fits the initial configuration dialog
+     * Bug 9516: Send Tor Launcher log messages to Browser Console
    * Bug 11641: Reorganize bundle directory structure to mimic Firefox
    * Bug 10819: Create a preference to enable/disable third party isolation
  * Linux:
@@ -26,6 +27,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014
    * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation
    * Bug 12249: Don't create PT debug files anymore
 
+Tor Browser Bundle 3.6.4 -- Aug 6 2014
+ * All Platforms
+   * Update Tor to 0.2.4.23
+   * Update Tor launcher to 0.2.5.6
+     * Bug 9516: Send Tor Launcher log messages to Browser Console
+   * Update Torbutton to 1.6.11.1
+     * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap
+     * Bug 12680: Fix Torbutton about url.
+
 Tor Browser Bundle 3.6.3 -- Jul 24 2014
  * All Platforms
    * Update Firefox to 24.7.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 1911175..f7b0446 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1
 TOR_TAG=tor-0.2.5.6-alpha
-TORLAUNCHER_TAG=0.2.6.1
+TORLAUNCHER_TAG=0.2.6.2
 TORBUTTON_TAG=1.6.12.0
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2