diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:26 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:26 -0400 |
| commit | bc9866e13ff140b237b0560a784bb72bff67a8e3 (patch) | |
| tree | 962abd71251435b1174b8a33ab7fe532fffe9fa0 /doc | |
| parent | dfe80c966d5136bc4f3287f4f762384ecc4df0c5 (diff) | |
| parent | a4c641cce91acb673f81db2b6093fde425039eaf (diff) | |
| download | tor-bc9866e13ff140b237b0560a784bb72bff67a8e3.tar.gz tor-bc9866e13ff140b237b0560a784bb72bff67a8e3.zip | |
Merge branch '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 ca6ac7b997..7b1d7d9bb2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1096,12 +1096,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 |