diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:15:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:15:57 -0400 |
| commit | 7c83b0a2a2b36a2ae2296f826ec53e5f7cd29a97 (patch) | |
| tree | 1b30cc68486aa9e4e86d5ee7e3252715af07b4f7 | |
| parent | c97072ef34c20fdf854444bb28446b53f67ba7bf (diff) | |
| parent | 8ac2de5ab98522abaa3289d6db155567e6126b50 (diff) | |
| download | tor-7c83b0a2a2b36a2ae2296f826ec53e5f7cd29a97.tar.gz tor-7c83b0a2a2b36a2ae2296f826ec53e5f7cd29a97.zip | |
Merge branch 'refuseunknown' into maint-0.2.2
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fe69a2d3fb..620f938741 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -908,6 +908,12 @@ is non-zero): the next day. All times are local, and given in 24-hour time. (Defaults to "month 1 0:00".) +**RefuseUnknownExits** **0**|**1**|**auto**:: + Prevent nodes that don't appear in the consensus from exiting using this + relay. If the option is 1, we always block exit attempts from such + nodes; if it's 0, we never do, and if the option is "auto", then we do + whatever the authorities suggest in the consensus. (Defaults to auto.) + **ServerDNSResolvConfFile** __filename__:: Overrides the default DNS configuration with the configuration in __filename__. The file format is the same as the standard Unix |