aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-26 16:39:31 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-26 16:39:31 -0400
commitc90535c539c60b031a3235d7e26b802865ef14c4 (patch)
treea0ed6bf861e4c9d1686ec4253de0548139a6ec91 /changes
parent07f2a06c6190696cf47b8e42476bb70b11083f15 (diff)
parentc1bcc1da038c5e70f2bdecc6296605d238db448c (diff)
downloadtor-c90535c539c60b031a3235d7e26b802865ef14c4.tar.gz
tor-c90535c539c60b031a3235d7e26b802865ef14c4.zip
Merge branch 'maint-0.4.4'
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket401646
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket40164 b/changes/ticket40164
new file mode 100644
index 0000000000..c96118d0a4
--- /dev/null
+++ b/changes/ticket40164
@@ -0,0 +1,6 @@
+ o Minor features (directory authority):
+ - Make it possible to specify multiple ConsensusParams torrc lines.
+ Now directory authority operators can for example put the main
+ ConsensusParams config in one torrc file and then add to it from
+ a different torrc file. Closes ticket 40164.
+