commit 1425e4458212b798161995fcefa3deaada544102 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Sep 24 01:01:53 2014 -0700

Revert "Back out Torbutton 1.6.12.3"

This reverts commit d37da21a366199555c67c11e984cddddbbc66301.

Ah, screw it. Let's keep it! What could possibly go wrong! --- Bundle-Data/Docs/ChangeLog.txt | 3 +++ gitian/versions | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5aa2c5c..e927d9c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,9 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Update NoScript to 2.6.8.42 * Update HTTPS Everywhere to 4.0.1 * Bug 12998: Prevent intermediate certs from being written to disk + * Update Torbutton to 1.6.12.3 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. diff --git a/gitian/versions b/gitian/versions index 6f5c161..c07a09d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.8.1esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.24 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.12.1 +TORBUTTON_TAG=1.6.12.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8