commit ecb0e43556dfa0ca607ebdbe9902167d794b220d Author: Mike Perry mikeperry-git@torproject.org Date: Mon Aug 4 19:45:21 2014 -0700

Update versions file and changelog for Torbutton 1.6.12.0. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4b4a1a2..bd80adb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,12 +6,13 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 5.0development.0 - * Update Torbutton to 1.6.11.1 + * Update Torbutton to 1.6.12.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. * 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 * Bug 11199: Improve behavior if tor exits * Bug 12451: Add option to hide TBB's logo diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8f558d7..1911175 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,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 -TORBUTTON_TAG=1.6.11.1 +TORBUTTON_TAG=1.6.12.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8