nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'catalyst-oniongit/bug23611'

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-21 14:42:03 -04:00
commit e1d8a4bd72
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug23611 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (documentation):
- Fix manpage to not refer to the obsolete (and misspelled)
UseEntryGuardsAsDirectoryGuards parameter in the description of
NumDirectoryGuards. Fixes bug 23611; bugfix on 0.2.4.8-alpha.

9
doc/tor.1.txt
View File

@ -1316,11 +1316,10 @@ The following options are useful only for clients (that is, if
default to 1 if the consensus parameter isn't set. (Default: 0) default to 1 if the consensus parameter isn't set. (Default: 0)
[[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__:: [[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__::
If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we have If UseEntryGuards is set to 1, we try to make sure we have at least NUM
at least NUM routers to use as directory guards. If this option is set to routers to use as directory guards. If this option is set to 0, use the
0, use the value from the guard-n-primary-dir-guards-to-use consensus value from the guard-n-primary-dir-guards-to-use consensus parameter, and
parameter, and default to 3 if the consensus parameter isn't set. default to 3 if the consensus parameter isn't set. (Default: 0)
(Default: 0)
[[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**:: [[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**::
If nonzero, and UseEntryGuards is set, minimum time to keep a guard before If nonzero, and UseEntryGuards is set, minimum time to keep a guard before