[tbb-commits] [tor-browser-bundle/master] Update versions and ChangeLog for TBB 3.6.

[mikeperry at torproject.org]

commit ce30cd3a3862189369ae09450b01b03271ad8366
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Apr 25 10:50:16 2014 -0700

    Update versions and ChangeLog for TBB 3.6.
---
 Bundle-Data/Docs/ChangeLog.txt |    7 +++++--
 gitian/versions                |    4 ++--
 gitian/versions.alpha          |    8 ++++----
 gitian/versions.beta           |   10 +++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index f9d1e76..2fd4e04 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -4,15 +4,18 @@ Tor Browser Bundle 3.6 -- Apr 29 2014
    * Update Tor Launcher to 0.2.5.4
      * Bug #11482: Hide bridge settings prompt if no default bridges.
      * Bug #11484: Show help button even if no default bridges.
-   * Update Torbutton to 1.6.8.1
+   * Update Torbutton to 1.6.9.0
      * Bug 7439: Improve download warning dialog text.
      * Bug 11384: Completely remove hidden toggle menu item.
    * Update HTTPS-Everywhere to 3.5
    * Update NoScript to 2.6.8.20
-   * Update obfs3 transport to XXX
+   * Update obfs3 transport to 0.2.8
    * Backport Pending Tor Patches:
      * Bug 11156: Additional obfsproxy startup error message fixes
    * Bug 11586: Include license files for component software in Docs directory.
+ * Windows and Mac:
+   * Bug 9308: Prevent install path from leaking in some JS exceptions
+               on Mac and Windows builds
 
 Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014
  * All Platforms
diff --git a/gitian/versions b/gitian/versions
index a9c372c..a73640e 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -5,7 +5,7 @@ VERIFY_TAGS=1
 
 FIREFOX_VERSION=24.5.0esr
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.4.21
 TORLAUNCHER_TAG=0.2.4.4
 TORBUTTON_TAG=1.6.7.0
@@ -15,7 +15,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.4
+OBFSPROXY_TAG=obfsproxy-0.2.8
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.13
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 9c5fa02..8cf027f 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=24.4.0esr
+FIREFOX_VERSION=24.5.0esr
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.5.3-alpha
-TORLAUNCHER_TAG=0.2.5.3
-TORBUTTON_TAG=1.6.8.1
+TORLAUNCHER_TAG=0.2.5.4
+TORBUTTON_TAG=1.6.9.0
 HTTPSE_TAG=3.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.4
+OBFSPROXY_TAG=obfsproxy-0.2.8
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.13
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
diff --git a/gitian/versions.beta b/gitian/versions.beta
index f6c24a2..fef930f 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=3.6-pre
+TORBROWSER_VERSION=3.6
 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
 BUILD_PT_BUNDLES=1
 
@@ -6,17 +6,17 @@ VERIFY_TAGS=1
 
 FIREFOX_VERSION=24.5.0esr
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.4.21
-TORLAUNCHER_TAG=0.2.5.3
-TORBUTTON_TAG=1.6.8.1
+TORLAUNCHER_TAG=0.2.5.4
+TORBUTTON_TAG=1.6.9.0
 HTTPSE_TAG=3.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.4
+OBFSPROXY_TAG=obfsproxy-0.2.8
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.13
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014