commit 1e099c54089b1ed1aef556069c2546709acb5cdf Author: David Fifield david@bamsoftware.com Date: Sat May 24 23:00:33 2014 -0700

Add Proxy configuration examples to torrc. --- meek-client/torrc | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/meek-client/torrc b/meek-client/torrc index 62f2c72..6ed137b 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -1,4 +1,9 @@ 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