aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-06 10:21:59 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-06 10:21:59 -0500
commit967d9c9f1029a5d9b993888bac91d3959bf4c991 (patch)
tree64754c78908c97b01a83273f3de32d6d96f52a48 /doc
parent4050dfa320e3322beb263bff3afc1db10df5af96 (diff)
downloadtor-967d9c9f1029a5d9b993888bac91d3959bf4c991.tar
tor-967d9c9f1029a5d9b993888bac91d3959bf4c991.tar.gz
Clarify default behavior of {SOCKS,Dir}Policy harder
Improvement on 11108 fix; suggested by cypherpunks.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 31a56e92e..4b686ca88 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1025,7 +1025,8 @@ The following options are useful only for clients (that is, if
[[SocksPolicy]] **SocksPolicy** __policy__,__policy__,__...__::
Set an entrance policy for this server, to limit who can connect to the
SocksPort and DNSPort ports. The policies have the same form as exit
- policies below, except that port specifiers are ignored.
+ policies below, except that port specifiers are ignored. Any address
+ not matched by some entry in the policy is accepted.
[[SocksTimeout]] **SocksTimeout** __NUM__::
Let a socks connection wait NUM seconds handshaking, and NUM seconds
@@ -1823,7 +1824,8 @@ if DirPort is non-zero):
[[DirPolicy]] **DirPolicy** __policy__,__policy__,__...__::
Set an entrance policy for this server, to limit who can connect to the
directory ports. The policies have the same form as exit policies above,
- except that port specifiers are ignored.
+ except that port specifiers are ignored. Any address not matched by
+ some entry in the policy is accepted.
[[FetchV2Networkstatus]] **FetchV2Networkstatus** **0**|**1**::
If set, we try to fetch the (obsolete, unused) version 2 network status