diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 15:29:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 15:30:11 -0500 |
| commit | 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b (patch) | |
| tree | 079048d084f73fa4772b983fcb7d085401cb5d94 /changes | |
| parent | 9e2608b0d35e7e890e53f83e40675851caff4a14 (diff) | |
| parent | 0493db4adb88b830b4339d320b96a88fc27a01bb (diff) | |
| download | tor-6c146f9c83e24dc3ae74f56f93d4e7caf570e98b.tar.gz tor-6c146f9c83e24dc3ae74f56f93d4e7caf570e98b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug13296 | 5 |
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. + |