diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-07 11:38:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-07 11:38:43 -0400 |
| commit | 2a3b65179056bdd55382434d610ef3ca89860783 (patch) | |
| tree | a60a4ec06889f2f928fd54ba2992a76de1d00942 /doc | |
| parent | 3823d0aa7d2a3ea4c21610c111aa199f75ace107 (diff) | |
| parent | f4ed254652e7f0b56083a49e7afa49beceaa1dda (diff) | |
| download | tor-2a3b65179056bdd55382434d610ef3ca89860783.tar.gz tor-2a3b65179056bdd55382434d610ef3ca89860783.zip | |
Merge remote-tracking branch 'sebastian/bug20064'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2e7a3537b1..8f5d174f60 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2163,7 +2163,9 @@ on the public Tor network. [[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**:: If set to 1, Tor will accept server descriptors with arbitrary "Address" elements. Otherwise, if the address is not an IP address or is a private IP - address, it will reject the server descriptor. (Default: 0) + address, it will reject the server descriptor. Additionally, Tor + will allow exit policies for private networks to fulfill Exit flag + requirements. (Default: 0) [[AuthDirBadExit]] **AuthDirBadExit** __AddressPattern...__:: Authoritative directories only. A set of address patterns for servers that |