commit e4245d87b2d64b25eb4c1868d2b78c25b940607f Author: David Fifield david@bamsoftware.com Date: Mon Jul 28 01:06:52 2014 -0700

Rearrange client torrc. --- meek-client/torrc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meek-client/torrc b/meek-client/torrc index 6ed137b..ffd2be9 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -1,12 +1,13 @@ +DataDirectory datadir UseBridges 1

# Socks4Proxy localhost:1080 # Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080

-# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com -# ClientTransportPlugin meek exec ./meek-client --log meek-client.log Bridge meek 0.0.2.0:1 -# ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log --helper 127.0.0.1:7000 ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log -DataDirectory datadir + +# With tor 0.2.5 you can do it this way: +# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +# ClientTransportPlugin meek exec ./meek-client --log meek-client.log