diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-12 11:09:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-12 11:09:10 -0400 |
| commit | 6a8861574bba27cbe924c147ee85b9fd72fff563 (patch) | |
| tree | e64eb602c0b54f7233527e2a7ea0cdb843aa0f0f /src | |
| parent | 5977da6c60bcde2dee97e443984da3e9a5808bb9 (diff) | |
| parent | 4aff97cfc7965414ad8506ce28a296da1bc4a161 (diff) | |
| download | tor-6a8861574bba27cbe924c147ee85b9fd72fff563.tar tor-6a8861574bba27cbe924c147ee85b9fd72fff563.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/torrc.sample.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index a1a08aa8f..f30fc32fd 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -16,7 +16,7 @@ ## configure one below. Set "SocksPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. #SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too. +#SocksPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept |