diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:52:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:52:20 -0400 |
| commit | af7fab020accd31f95ba2037ccd25c65e3290571 (patch) | |
| tree | ece006ac592b5d153e173332d6489acc22f98058 /doc | |
| parent | 5c83c06c985d314f31c72d3fb5a29c1c2f396f66 (diff) | |
| parent | 8df3a909466217d6738d6fe4f7555f569b2a4cb7 (diff) | |
| download | tor-af7fab020accd31f95ba2037ccd25c65e3290571.tar tor-af7fab020accd31f95ba2037ccd25c65e3290571.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
Diffstat (limited to 'doc')
| -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 fe69a2d3f..620f93874 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 |