[tor-commits] [tor-browser-bundle/master] Download obfsproxy.

[mikeperry at torproject.org]

commit 3554d3b0f48ac67658ade3897e510f46eff2b84b
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Nov 7 05:59:29 2013 +0000

    Download obfsproxy.
    
    I copied pyptlib.gpg to obfsproxy.gpg.
---
 gitian/fetch-inputs.sh   |    1 +
 gitian/gpg/obfsproxy.gpg |  Bin 0 -> 2215 bytes
 gitian/verify-tags.sh    |    1 +
 gitian/versions          |    1 +
 gitian/versions.alpha    |    1 +
 5 files changed, 4 insertions(+)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 70b8166..f13d5f5 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -284,6 +284,7 @@ torbutton             https://git.torproject.org/torbutton.git            $TORBU
 tor-launcher          https://git.torproject.org/tor-launcher.git         $TORLAUNCHER_TAG
 tor-browser           https://git.torproject.org/tor-browser.git          $TORBROWSER_TAG
 pyptlib               https://git.torproject.org/pluggable-transports/pyptlib.git
+obfsproxy             https://git.torproject.org/pluggable-transports/obfsproxy.git
 EOF
 
 exit 0
diff --git a/gitian/gpg/obfsproxy.gpg b/gitian/gpg/obfsproxy.gpg
new file mode 100644
index 0000000..4381baa
Binary files /dev/null and b/gitian/gpg/obfsproxy.gpg differ
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 2e3f92a..e30ebbb 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -62,6 +62,7 @@ tor                   tor.gpg                   $TOR_TAG
 https-everywhere      https-everywhere.gpg      $HTTPSE_TAG
 openssl               tor.gpg                   $OPENSSL_TAG
 pyptlib               pyptlib.gpg               $PYPTLIB_TAG
+obfsproxy             obfsproxy.gpg             $OBFSPROXY_TAG
 EOF
 
 cd "$INPUTS_DIR"
diff --git a/gitian/versions b/gitian/versions
index cb98b87..43dd9c0 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,6 +14,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
+OBFSPROXY_TAG=obfsproxy-0.2.3
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index b111c8c..6e2e58b 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -14,6 +14,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
+OBFSPROXY_TAG=obfsproxy-0.2.3
 
 GITIAN_TAG=tor-browser-builder-3.0-4