commit 97175a91a59216d7eddade4be5c92c82bd225f86 Author: Cecylia Bocovich <cohosh@torproject.org> Date: Fri Aug 13 12:29:48 2021 -0400 Modify torrc example to pass client args in bridge line --- client/README.md | 2 +- client/torrc | 8 +++----- client/torrc-localhost | 8 -------- client/torrc.localhost | 6 ++++++ 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/client/README.md b/client/README.md index 0680408..c6f4bda 100644 --- a/client/README.md +++ b/client/README.md @@ -29,7 +29,7 @@ go build ### Running the Snowflake client with Tor -We have an example `torrc` file in this repository. The client uses these following `torrc` options by default: +The Snowflake client can be configured with either command line options or SOCKS options. We have a few example `torrc` files in this directory. We recommend the following `torrc` options by default: ``` UseBridges 1 diff --git a/client/torrc b/client/torrc index 1328adc..039653f 100644 --- a/client/torrc +++ b/client/torrc @@ -1,10 +1,8 @@ UseBridges 1 DataDirectory datadir -ClientTransportPlugin snowflake exec ./client \ --url https://snowflake-broker.torproject.net.global.prod.fastly.net/ \ --front cdn.sstatic.net \ --ice stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 +ClientTransportPlugin snowflake exec ./client -log snowflake.log + +Bridge snowflake 192.0.2.3:1 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 -Bridge snowflake 192.0.2.3:1 SocksPort auto diff --git a/client/torrc-localhost b/client/torrc-localhost deleted file mode 100644 index b2a6d05..0000000 --- a/client/torrc-localhost +++ /dev/null @@ -1,8 +0,0 @@ -UseBridges 1 -DataDirectory datadir - -ClientTransportPlugin snowflake exec ./client \ --url http://localhost:8080/ \ --keep-local-addresses - -Bridge snowflake 192.0.2.3:1 diff --git a/client/torrc.localhost b/client/torrc.localhost new file mode 100644 index 0000000..e09f94c --- /dev/null +++ b/client/torrc.localhost @@ -0,0 +1,6 @@ +UseBridges 1 +DataDirectory datadir + +ClientTransportPlugin snowflake exec ./client -keep-local-addresses + +Bridge snowflake 192.0.2.3:1 url=http://localhost:8080/