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

[mikeperry at torproject.org]

commit 2452c5f3630b563914241976837cf2ef07ac17db
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Nov 11 07:52:47 2013 +0000

    Download flashproxy.
    
    gpg --output gpg/flashproxy.gpg --export --export-options export-minimal 0xC11F6276
---
 gitian/fetch-inputs.sh    |    1 +
 gitian/gpg/flashproxy.gpg |  Bin 0 -> 5876 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 9aa1513..281f500 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -286,6 +286,7 @@ tor-launcher          https://git.torproject.org/tor-launcher.git         $TORLA
 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
+flashproxy            https://git.torproject.org/flashproxy.git
 EOF
 
 exit 0
diff --git a/gitian/gpg/flashproxy.gpg b/gitian/gpg/flashproxy.gpg
new file mode 100644
index 0000000..f3b543f
Binary files /dev/null and b/gitian/gpg/flashproxy.gpg differ
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index e30ebbb..9b75a47 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -63,6 +63,7 @@ https-everywhere      https-everywhere.gpg      $HTTPSE_TAG
 openssl               tor.gpg                   $OPENSSL_TAG
 pyptlib               pyptlib.gpg               $PYPTLIB_TAG
 obfsproxy             obfsproxy.gpg             $OBFSPROXY_TAG
+flashproxy            flashproxy.gpg            $FLASHPROXY_TAG
 EOF
 
 cd "$INPUTS_DIR"
diff --git a/gitian/versions b/gitian/versions
index b588f84..5933c51 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -15,6 +15,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
 OBFSPROXY_TAG=obfsproxy-0.2.3
+FLASHPROXY_TAG=1.4
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index bf13dfc..f38bc5c 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -15,6 +15,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
 OBFSPROXY_TAG=obfsproxy-0.2.3
+FLASHPROXY_TAG=1.4
 
 GITIAN_TAG=tor-browser-builder-3.0-4