Merge branch 'bug21715_031_01_squashed'

This commit is contained in:
Nick Mathewson
2017-04-25 12:43:41 -04:00
2 changed files with 14 additions and 9 deletions
+5
View File
@@ -0,0 +1,5 @@
o Documentation (man page):
- Default of NumEntryGuards is 1 if the consensus parameter
guard-n-primary-guards-to-use isn't set. Default of NumDirectoryGuards
is 3 if the consensus parameter guard-n-primary-dir-guards-to-use isn't
set. Fixes bug 21715.