[tor-commits] [tor-browser-bundle/master] Bug 11629: Revert obfsproxy to 0.2.4.

[mikeperry at torproject.org]

commit 793a4cd404516b032bc696b4b0e6bb43bafb2e18
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Apr 28 20:01:29 2014 +0200

    Bug 11629: Revert obfsproxy to 0.2.4.
---
 Bundle-Data/Docs/ChangeLog.txt |    1 -
 gitian/versions.beta           |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 750537e..e7d5178 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -8,7 +8,6 @@ Tor Browser Bundle 3.6 -- Apr 29 2014
      * Bug 7439: Improve download warning dialog text.
      * Bug 11384: Completely remove hidden toggle menu item.
    * Update NoScript to 2.6.8.20
-   * Update obfs3 transport to 0.2.8
    * Update fte transport to 0.2.13
    * Backport Pending Tor Patches:
      * Bug 11156: Additional obfsproxy startup error message fixes
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 59a18fe..3460248 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -16,7 +16,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.8
+OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.13
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014