[tbb-commits] [tor-browser-bundle/master] Update changelog and bumped Tor Browser branch.

[gk at torproject.org]

commit 59cb26c5fa474bc766e13974d893d51e98ea8453
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Aug 29 13:57:11 2014 +0000

    Update changelog and bumped Tor Browser branch.
---
 Bundle-Data/Docs/ChangeLog.txt |    5 ++++-
 gitian/versions.alpha          |    4 ++--
 gitian/versions.nightly        |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 37d8339..80c80b4 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -8,6 +8,7 @@ Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014
      * Bug 11199: Improve error messages if Tor exits unexpectedly
    * Update Torbutton to 1.6.12.1
      * Bug 12684: New strings for canvas image extraction message
+     * Bug 8940: Move RecommendedTBBVersions file to www.torproject.org
    * Bug 12684: Improve Canvas image extraction permissions prompt
    * Bug 7265: Only prompt for first party canvas access. Log all scripts
                that attempt to extract canvas images to Browser console.
@@ -16,15 +17,17 @@ Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014
    * Bug 4234: Automatic Update support (off by default)
    * Bug 9881: Open popups in new tabs by default
    * Meek Pluggable Transport:
-     * Use TLSv1.0 in meek-http-helper to blend in with Firefox 24
+     * Bug 12766: Use TLSv1.0 in meek-http-helper to blend in with Firefox 24
  * Windows:
    * Bug 10065: Enable DEP, ASLR, and SSP hardening options
 
 Tor Browser Bundle 3.6.5 -- Sep 2 2014
  * All Platforms
    * Update Firefox to 24.8.0esr
+   * Update HTTPS Everywhere to 4.0.0
    * Update Torbutton to 1.6.12.1
      * Bug 12684: New strings for canvas image extraction message
+     * Bug 8940: Move RecommendedTBBVersions file to www.torproject.org
      * Bug 9531: Workaround to avoid rare hangs during New Identity
    * Bug 12684: Improve Canvas image extraction permissions prompt
    * Bug 7265: Only prompt for first party canvas access. Log all scripts
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 685bbc2..e503ef2 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -1,10 +1,10 @@
-TORBROWSER_VERSION=4.0-alpha-1
+TORBROWSER_VERSION=4.0-alpha-2
 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=24.7.0esr
+FIREFOX_VERSION=24.8.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 38f7863..4f483be 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -4,11 +4,11 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=0
 
-FIREFOX_VERSION=24.7.0esr
+FIREFOX_VERSION=24.8.0esr
 
 TORBROWSER_UPDATE_CHANNEL=default
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1
 TOR_TAG=master
 TORLAUNCHER_TAG=master
 TORBUTTON_TAG=master