[tor-commits] [tor-browser-build/master] Bug 20636: remove fte from bridge_prefs.js for Windows 64

[gk@xxxxxxxxxxxxxx]

commit 3c517c1a36a4e9f1251679fc4c129569a874be76
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Thu Nov 9 11:18:18 2017 +0100

    Bug 20636: remove fte from bridge_prefs.js for Windows 64
---
 projects/tor-browser/build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index f9740f7..022d6e9 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -118,7 +118,10 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB
 [% END -%]
 [% IF c("var/windows") -%]
   # We don't have snowflake available on Windows yet
-  grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH
+  # We don't have fte available on Windows x86_64 yet
+  grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
+  [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \
+      >> $TBDIR/$EXTOVERRIDESPATH
 [% END -%]
 [% IF c("var/osx") -%]
   # FTE is temporarily removed due to bug 18495.

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits