commit 4ecc40a4a45508b513321767f77b9e6e67f01c15 Author: Mike Perry mikeperry-git@torproject.org Date: Fri Jun 27 09:47:58 2014 -0700

Update Torbutton to 1.6.11.0. Downgrade meek to 0.8. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions.alpha | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f3ea6ce..1e2aecd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,8 +5,10 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Update NoScript to 2.6.8.30rc4 * Update HTTPS Everywhere to 3.5.3 * Script permissions now apply based on URL bar - * Update Torbutton to 1.6.10.1 + * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. * Update Tor Launcher to 0.2.6.0 * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 479b6df..a724e48 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.6.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.10.1 +TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.8

GITIAN_TAG=tor-browser-builder-3.x-5