summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-04-25 12:43:41 -0400
committerNick Mathewson <nickm@torproject.org>2017-04-25 12:43:41 -0400
commitd4a2decc56cc5328c8edfde2cc512efd844cc32b (patch)
tree84b0136d41fc5f16d83ce4fd4546d61294f1fd41 /changes
parent236cf49670d1a4995e0494675ee4fbf155e6f90a (diff)
parentfd8284c8b9b804ef405db211bae51a9fd5442979 (diff)
downloadtor-d4a2decc56cc5328c8edfde2cc512efd844cc32b.tar.gz
tor-d4a2decc56cc5328c8edfde2cc512efd844cc32b.zip
Merge branch 'bug21715_031_01_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug217155
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug21715 b/changes/bug21715
new file mode 100644
index 0000000000..ad9d8bfdaf
--- /dev/null
+++ b/changes/bug21715
@@ -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.