summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-12 15:32:15 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-12 15:32:15 -0500
commit5c813f6ca1d6e385cfad5219108f8ac00677cf35 (patch)
tree7415260d4ee4dbb636926856f6002918ad8dadcf /changes
parent9b11dc36179e48bd39e57a9f3e0e26a25f50adfa (diff)
parent6c146f9c83e24dc3ae74f56f93d4e7caf570e98b (diff)
downloadtor-5c813f6ca1d6e385cfad5219108f8ac00677cf35.tar.gz
tor-5c813f6ca1d6e385cfad5219108f8ac00677cf35.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug132965
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug13296 b/changes/bug13296
new file mode 100644
index 0000000000..d6fe038c30
--- /dev/null
+++ b/changes/bug13296
@@ -0,0 +1,5 @@
+ o Directory authority changes:
+ - Remove turtles as a directory authority.
+ - Add longclaw as a new (v3) directory authority. This implements
+ ticket 13296. This keeps the directory authority count at 9.
+