commit 87faed921ef37e78ed9b31c6f096c2f0bd5ffab6 Author: Taylor Yu catalyst@torproject.org Date: Thu Sep 21 13:31:54 2017 -0500

Remove wrong config parameter mention from manpage

Don't refer to the obsolete (and misspelled) UseEntryGuardsAsDirectoryGuards config parameter in the manpage. --- changes/bug23611 | 4 ++++ doc/tor.1.txt | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changes/bug23611 b/changes/bug23611 new file mode 100644 index 000000000..f47e56200 --- /dev/null +++ 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 index 38c3fe42b..ba2bc13da 100644 --- 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