[tor-commits] [tor-browser-bundle/master] Bug 22831: Enable Snowflake for mac.

[gk at torproject.org]

commit ce3fbdf44272e3334d935044599a3b42cf7ff87c
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Jul 5 23:10:10 2017 -0700

    Bug 22831: Enable Snowflake for mac.
---
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 +++
 gitian/mkbundle-mac.sh                            | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
index 271b36c..06dbec9 100644
--- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
@@ -3,3 +3,6 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/ob
 
 ## meek configuration
 ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client
+
+## snowflake configuration
+ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 7bf546e..4f850c6 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -56,9 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip
 (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip TorBrowser.app.meek-http-helper)
 cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
-# FTE is temporarily removed due to bug 18495 and snowflake is Linux-only for
-# now.
-  grep -Ev 'default_bridge\.fte|default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
+# FTE is temporarily removed due to bug 18495.
+  grep -Ev 'default_bridge\.fte' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 cp mac-tor.sh $GITIAN_DIR/inputs/