Merge branch 'maint-0.2.5'

This commit is contained in:
Roger Dingledine
2014-07-24 16:23:26 -04:00
4 changed files with 29 additions and 10 deletions
+6
View File
@@ -0,0 +1,6 @@
Major features:
- Make the number of entry guards configurable via a new
NumEntryGuards consensus parameter, and the number of directory
guards configurable via a new NumDirectoryGuards consensus
parameter. Implements ticket 12688.