aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-08-06 10:11:57 +0000
committerRoger Dingledine <arma@torproject.org>2004-08-06 10:11:57 +0000
commit59a356ea476ec8438e345b8695e9faf73b79c0a8 (patch)
tree4278c33c9bbb55f7a5b9919c178166cffa522e4a /src/config
parent276d953b2215505cd538a2e00f8b3dc6672f783a (diff)
downloadtor-59a356ea476ec8438e345b8695e9faf73b79c0a8.tar
tor-59a356ea476ec8438e345b8695e9faf73b79c0a8.tar.gz
clarify sockspolicy, exitpolicy rules
svn:r2157
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.sample.in12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index aea4eb790..b26b22d18 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -9,11 +9,12 @@ SocksPort 9050
SocksBindAddress 127.0.0.1 # accept connections only from localhost
#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port
-# Entry policies to allow/deny SOCKS requests based on IP. By default,
-# we accept all requests from SocksBindAddress.
+# Entry policies to allow/deny SOCKS requests based on IP. First
+# entry that matches wins. If no SocksPolicy is set, we accept all
+# (and only) requests from SocksBindAddress.
#
-#SocksPolicy accept 192.168.0.1/16:*
-#SocksPolicy reject *:*
+#SocksPolicy accept 192.168.0.1/16
+#SocksPolicy reject *
# By default, we send log messages to stdout. If you want
# them to go somewhere else, uncomment one or more of these example
@@ -53,7 +54,8 @@ SocksBindAddress 127.0.0.1 # accept connections only from localhost
# Uncomment this to mirror the directory for others (please do)
#DirPort 9030
-## A comma-separated list of exit policies. If you want to *replace*
+## A comma-separated list of exit policies. They're considered first
+## to last, and the first match wins. If you want to *replace*
## the default exit policy, end this with either a reject *:* or an
## accept *:*. Otherwise, you're *augmenting* (prepending to) the
## default exit policy. Leave commented to just use the default.