diff options
author | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:26 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:26 -0400 |
commit | bc9866e13ff140b237b0560a784bb72bff67a8e3 (patch) | |
tree | 962abd71251435b1174b8a33ab7fe532fffe9fa0 /changes | |
parent | dfe80c966d5136bc4f3287f4f762384ecc4df0c5 (diff) | |
parent | a4c641cce91acb673f81db2b6093fde425039eaf (diff) | |
download | tor-bc9866e13ff140b237b0560a784bb72bff67a8e3.tar.gz tor-bc9866e13ff140b237b0560a784bb72bff67a8e3.zip |
Merge branch 'maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/ticket12688 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket12688 b/changes/ticket12688 new file mode 100644 index 0000000000..88228e5506 --- /dev/null +++ b/changes/ticket12688 @@ -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. + |