diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:08 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:08 -0400 |
| commit | a4c641cce91acb673f81db2b6093fde425039eaf (patch) | |
| tree | 80ab630220e7565788719f359b495f5f70246713 /doc | |
| parent | 5c200d9be28ac9e53caac333ddd334539524d9e1 (diff) | |
| parent | 71c62b15ca809105cbba0bf2fa86484793701b64 (diff) | |
| download | tor-a4c641cce91acb673f81db2b6093fde425039eaf.tar.gz tor-a4c641cce91acb673f81db2b6093fde425039eaf.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'doc')
| -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 1ccf847c30..abe613e569 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1092,12 +1092,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 |