[tor-commits] [tor-messenger-build/master] Disable FTE on OS X (see #13252)

[sukhbir at torproject.org]

commit e6c8f91328dd3a1bd631420f8afe83a40a83e822
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Aug 30 22:25:25 2016 -0400

    Disable FTE on OS X (see #13252)
---
 projects/tor-messenger/build.osx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index a7b261f..5013d12 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -13,6 +13,10 @@ mkdir torbrowser
 cd torbrowser
 mkdir tor-launcher at torproject.org
 7z x -y -otor-launcher at torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %]
+
+# FTE is disabled on OS X. See #13252.
+sed -i '/default_bridge\.fte/d' $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js
+
 cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \
         tor-launcher at torproject.org/defaults/preferences/prefs.js
 7z x $rootdir/[% c('input_files_by_name/tor-browser') %]