commit 45439bfced7f41c2e0beecb715880cb83d421618 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 15:37:47 2012 -0400

Revert "6819: typo in torrc.sample.in"

This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161.

We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users. --- changes/bug6819 | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/changes/bug6819 b/changes/bug6819 deleted file mode 100644 index 8b5c224..0000000 --- a/changes/bug6819 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on - 0.2.3.14-alpha. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f30fc32..a1a08aa 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 address:port too. +#SocksPort 192.168.0.1:9100 # Bind to this adddress: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