diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-06 10:22:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-06 10:22:40 -0500 |
| commit | 4a2a1e572ec789efee2779e00d920a70892845cc (patch) | |
| tree | 184047825e2fbc3b5b46984e29a72145c05ecf2f /doc | |
| parent | d3c5df6cf6f3d978d28e6f5d707af3541a183544 (diff) | |
| parent | 967d9c9f1029a5d9b993888bac91d3959bf4c991 (diff) | |
| download | tor-4a2a1e572ec789efee2779e00d920a70892845cc.tar.gz tor-4a2a1e572ec789efee2779e00d920a70892845cc.zip | |
Merge branch 'bug11108'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 89608f7dc0..c49692c69d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1041,7 +1041,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. + 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 @@ -1838,7 +1839,9 @@ 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. + directory ports. The policies have the same form as exit policies above, + 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 @@ -1882,7 +1885,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS [[AuthDirBadDir]] **AuthDirBadDir** __AddressPattern...__:: Authoritative directories only. A set of address patterns for servers that will be listed as bad directories in any network status document this - authority publishes, if **AuthDirListBadDirs** is set. + authority publishes, if **AuthDirListBadDirs** is set. + + + + (The address pattern syntax here and in the options below + is the same as for exit policies, except that you don't need to say + "accept" or "reject", and ports are not needed.) [[AuthDirBadExit]] **AuthDirBadExit** __AddressPattern...__:: Authoritative directories only. A set of address patterns for servers that |