[tor-commits] [tor-browser-bundle/master] missing files from initial fteproxy commit

[mikeperry at torproject.org]

commit 01cd8b3cda018d85e8dbd4bd60f1b8c6ab48e42f
Author: Kevin P. Dyer <kpdyer at gmail.com>
Date:   Sun Feb 9 12:07:05 2014 -0800

    missing files from initial fteproxy commit
---
 Bundle-Data/beta/mac/torrc-defaults-appendix     |    5 +++++
 Bundle-Data/beta/windows/torrc-defaults-appendix |    4 ++++
 Bundle-Data/mac-tor.sh                           |    1 +
 3 files changed, 10 insertions(+)

diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix
index 3738142..d3e211d 100644
--- a/Bundle-Data/beta/mac/torrc-defaults-appendix
+++ b/Bundle-Data/beta/mac/torrc-defaults-appendix
@@ -1,4 +1,9 @@
 
+## fteproxy configuration
+# Bridge fte bridges.fteproxy.org:8080
+
+ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed
+
 ## obfsproxy configuration
 #
 # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix
index 550e7b5..965b98a 100644
--- a/Bundle-Data/beta/windows/torrc-defaults-appendix
+++ b/Bundle-Data/beta/windows/torrc-defaults-appendix
@@ -1,3 +1,7 @@
+## fteproxy configuration
+# Bridge fte bridges.fteproxy.org:8080
+
+ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed
 
 ## obfsproxy configuration
 #
diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh
index fb9c4f4..9a22096 100755
--- a/Bundle-Data/mac-tor.sh
+++ b/Bundle-Data/mac-tor.sh
@@ -2,6 +2,7 @@
 # Compiled Python modules require a compatible Python, which means 32-bit 2.6.
 export VERSIONER_PYTHON_VERSION=2.6
 export VERSIONER_PYTHON_PREFER_32_BIT=yes
+export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH
 # Set the current working directory to the directory containing this executable,
 # so that pluggable transport executables can be given with relative paths. This
 # works around a change in OS X 10.9, where the current working directory is