[tor-commits] [tor-browser-bundle/master] Bug 12903: Integrate obfs4proxy into Tor Browser.

[mikeperry at torproject.org]

commit 0a916fb562dcc744e4f3ce7b491669bcfd41b64c
Merge: 3fd3351 bb6389f
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Oct 13 15:27:00 2014 +0000

    Bug 12903: Integrate obfs4proxy into Tor Browser.
    
    We start shipping obfs4proxy in Tor Browser nightlies and the alpha
    series.

 .../Docs/Licenses/PluggableTransports/LICENSE      |   77 +++++++++++++++++---
 Bundle-Data/PTConfigs/bridge_prefs.js              |    4 +
 .../PTConfigs/linux/torrc-defaults-appendix        |    6 +-
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix  |    5 +-
 .../PTConfigs/windows/torrc-defaults-appendix      |    5 +-
 .../linux/gitian-pluggable-transports.yml          |   54 ++++++++++++++
 .../mac/gitian-pluggable-transports.yml            |   54 ++++++++++++++
 .../windows/gitian-pluggable-transports.yml        |   54 ++++++++++++++
 gitian/fetch-inputs.sh                             |   17 ++++-
 gitian/gpg/obfs4proxy.gpg                          |  Bin 0 -> 34128 bytes
 gitian/mkbundle-linux.sh                           |    3 +-
 gitian/mkbundle-mac.sh                             |    3 +-
 gitian/mkbundle-windows.sh                         |    3 +-
 gitian/verify-tags.sh                              |    5 +-
 gitian/versions.alpha                              |    9 +++
 gitian/versions.nightly                            |    9 +++
 16 files changed, 291 insertions(+), 17 deletions(-)

diff --cc gitian/versions.nightly
index 9dc6f3f,3867629..5bd9d63
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@@ -95,7 -100,8 +100,9 @@@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505a
  SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
  PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
  GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff
 +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+ GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
+ GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
  
  ## Non-git package URLs
  OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}