diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-24 12:19:15 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:19:48 -0400 |
| commit | 71c62b15ca809105cbba0bf2fa86484793701b64 (patch) | |
| tree | 0a303f98a6723715b618c632c54fdbf6acb0ef8c | |
| parent | 9fc276a1c7f94d1e0a48e00a358536027a9a7820 (diff) | |
| download | tor-71c62b15ca809105cbba0bf2fa86484793701b64.tar.gz tor-71c62b15ca809105cbba0bf2fa86484793701b64.zip | |
update manpage for numentryguards / numdirectoryguards
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index eb9ad6770a..779db61c29 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1054,12 +1054,16 @@ The following options are useful only for clients (that is, if [[NumEntryGuards]] **NumEntryGuards** __NUM__:: If UseEntryGuards is set to 1, we will try to pick a total of NUM routers - as long-term entries for our circuits. (Default: 3) + as long-term entries for our circuits. If NUM is 0, we try to learn + the number from the NumEntryGuards consensus parameter, and default + to 3 if the consensus parameter isn't set. (Default: 0) [[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__:: If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we have at least NUM routers to use as directory guards. If this option - is set to 0, use the value from NumEntryGuards. (Default: 0) + is set to 0, use the value from the NumDirectoryGuards consensus + parameter, falling back to the value from NumEntryGuards if the + consensus parameter is 0 or isn't set. (Default: 0) [[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before |