commit e1d8a4bd720dd9941b467edb42ca64624743f51d
parent c92ecac8bbac1d3bb1961f4210129011ce910c7d
Author: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Sep 2017 14:42:03 -0400
Merge remote-tracking branch 'catalyst-oniongit/bug23611'
Diffstat:
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changes/bug23611 b/changes/bug23611
@@ -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.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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)
[[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 the guard-n-primary-dir-guards-to-use consensus
- parameter, and default to 3 if the consensus parameter isn't set.
- (Default: 0)
+ If UseEntryGuards is set to 1, 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 the guard-n-primary-dir-guards-to-use consensus parameter, and
+ default to 3 if the consensus parameter isn't set. (Default: 0)
[[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**::
If nonzero, and UseEntryGuards is set, minimum time to keep a guard before
