[tor-commits] [tor-browser-bundle/master] Bump versions file and update changelog for a couple bugs.

[mikeperry at torproject.org]

commit 1bcde1184949799508b78777e98fe8098a200244
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Nov 10 12:01:08 2014 -0800

    Bump versions file and update changelog for a couple bugs.
---
 Bundle-Data/Docs/ChangeLog.txt |    6 ++++--
 gitian/versions.alpha          |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index afce051..7588ca5 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,12 +2,14 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014
  * All Platforms
    * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation
    * Bug 11955: Backport HTTPS Certificate Pinning patches from Firefox 32
+   * Bug 13684: Backport Mozilla bug #1066190 (pinning issue fixed in Firefox 33)
    * Bug 13019: Make JS engine use English locale if a pref is set by Torbutton
    * Bug 13301: Prevent extensions incompatibility error after upgrades
    * Bug 13460: Fix MSVC compilation issue
-   * Update Tor to 0.2.6.0-alpha
+   * Bug 13504: Remove stale bridges from default bridge set
+   * Update Tor to 0.2.6.1-alpha
    * Update NoScript to 2.6.9.3
-   * Update Torbutton to 1.8.0.2
+   * Update Torbutton to 1.8.0.3
      * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction
      * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
      * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index aace7f6..1c4227f 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,10 +8,10 @@ FIREFOX_VERSION=31.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build4
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build5
 TOR_TAG=tor-0.2.6.1-alpha
 TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.8.0.2
+TORBUTTON_TAG=1.8.0.3
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2
 ZLIB_TAG=v1.2.8