diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-30 09:16:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-30 09:16:55 -0400 |
| commit | 30d853a9067e866312e475f42fb6063718591af8 (patch) | |
| tree | 6d064ef25c28705a9e7a73431cd4c95d24ba5fc9 /doc | |
| parent | 084924360aa937014aa4b86de1131e0a413e81de (diff) | |
| parent | b7edfcbf6bb3a27d914ad883ae75413a4d25739a (diff) | |
| download | tor-30d853a9067e866312e475f42fb6063718591af8.tar.gz tor-30d853a9067e866312e475f42fb6063718591af8.zip | |
Merge remote-tracking branch 'tor-github/pr/425'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 406372433f..8729b8ed50 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2211,7 +2211,8 @@ is non-zero): __filename__. The file format is the same as the standard Unix "**resolv.conf**" file (7). This option, like all other ServerDNS options, only affects name lookups that your server does on behalf of clients. - (Defaults to use the system DNS configuration.) + (Defaults to use the system DNS configuration or a localhost DNS service + in case no nameservers are found in a given configuration.) [[ServerDNSAllowBrokenConfig]] **ServerDNSAllowBrokenConfig** **0**|**1**:: If this option is false, Tor exits immediately if there are problems |