aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-10 15:44:41 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-10 15:44:41 -0400
commit0b1a334842f632b935d0b23757722d06bd145724 (patch)
tree2182965c5ff652c8289df03d438c8f69c5322320 /changes
parentc78a42685fd342ec961ede7a61e7b82bd40060b8 (diff)
parentd9ba9f91d25210f10f740d243899dbe99f8acb60 (diff)
downloadtor-0b1a334842f632b935d0b23757722d06bd145724.tar
tor-0b1a334842f632b935d0b23757722d06bd145724.tar.gz
Merge branch 'bug5786'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug5786_nocrash7
-rw-r--r--changes/bug5786_nodups7
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug5786_nocrash b/changes/bug5786_nocrash
new file mode 100644
index 000000000..ec6c5d817
--- /dev/null
+++ b/changes/bug5786_nocrash
@@ -0,0 +1,7 @@
+ o Major bugfixes (directory authorties):
+ - When computing weight parameters, behave more robustly in the
+ presence of a bad bwweightscale value. Previously, the
+ authorities would crash if they agreed on a sufficiently browken
+ weight_scale value: now, they use a reasonable default and carry
+ on. Partial fix for 5786; bugfix on 0.2.2.17-alpha.
+
diff --git a/changes/bug5786_nodups b/changes/bug5786_nodups
new file mode 100644
index 000000000..795b668a8
--- /dev/null
+++ b/changes/bug5786_nodups
@@ -0,0 +1,7 @@
+ o Major bugfixes (directory authority):
+ - Check more thoroughly to prevent a rogue authority from
+ double-voting on any consensus directory parameter. Previously,
+ authorities would crash in this case if the total number of votes
+ for any parameter exceeded the number of active voters, but would
+ let it pass otherwise. Partial fix for bug 5786; bugfix on
+ 0.2.2.2-alpha.