summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-27 12:45:07 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-27 12:45:07 -0400
commit346c2eb4e60299f69327b5e63e1e25aaf678f964 (patch)
tree110b6b0cecccecb62c6c0c917922e0f51dbce870 /changes
parent8b58e1e323e362463906d2576b9d2b9e788c2f30 (diff)
parentd00ed406e08942d6539281eb28e875939ee214e5 (diff)
downloadtor-346c2eb4e60299f69327b5e63e1e25aaf678f964.tar.gz
tor-346c2eb4e60299f69327b5e63e1e25aaf678f964.zip
Merge branch 'bug25843_v2_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug258433
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug25843 b/changes/bug25843
new file mode 100644
index 0000000000..ddbbbef787
--- /dev/null
+++ b/changes/bug25843
@@ -0,0 +1,3 @@
+ o Minor feature (entry guards):
+ - Introduce torrc option NumPrimaryGuards for controlling the number of
+ primary guards. Closes ticket 25843. \ No newline at end of file