diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:25:12 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:25:12 -0400 |
commit | e1e62f9d5735da64dc1435d3a40db77f6229766a (patch) | |
tree | 70654c50b0e9d80c855f3a9868ad3c4a15c53235 /changes | |
parent | 920e3d6a191486a5879aa0f2e0bfcf743d075c12 (diff) | |
parent | 2f2fba8a918674b7187a5b497bb156b79aaec4e1 (diff) | |
download | tor-e1e62f9d5735da64dc1435d3a40db77f6229766a.tar.gz tor-e1e62f9d5735da64dc1435d3a40db77f6229766a.zip |
Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug17668 | 5 | ||||
-rw-r--r-- | changes/bug17702 | 6 | ||||
-rw-r--r-- | changes/bug18318_ed | 7 | ||||
-rw-r--r-- | changes/bug18368 | 5 |
4 files changed, 23 insertions, 0 deletions
diff --git a/changes/bug17668 b/changes/bug17668 new file mode 100644 index 0000000000..fa5c1c8081 --- /dev/null +++ b/changes/bug17668 @@ -0,0 +1,5 @@ + o Major bugfixes (voting): + - When collating votes by Ed25519 identities, authorities now + include a "NoEdConsensus" flag if the ed25519 value (or lack thereof) + for a server does not reflect the majority consensus. Related to bug + 17668; bugfix on 0.2.7.2-alpha. diff --git a/changes/bug17702 b/changes/bug17702 new file mode 100644 index 0000000000..4fda36f736 --- /dev/null +++ b/changes/bug17702 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Actually enable Ed25519-based directory collation. + Previously, the code had been written, but some debugging code that had + accidentally been left in the codebase made it stay turned off. + Fixes bug 17702; bugfix on 0.2.7.2-alpha. + diff --git a/changes/bug18318_ed b/changes/bug18318_ed new file mode 100644 index 0000000000..af39234d53 --- /dev/null +++ b/changes/bug18318_ed @@ -0,0 +1,7 @@ + o Major bugfixes: + - When generating a vote with keypinning disabled, never include two + entries for the same ed25519 identity. This bug was causing + authorities to generate votes that they could not parse when a router + violated key pinning by changing its RSA identity but keeping its + Ed25519 identity. Fixes bug 17668; fixes part of bug 18318. Bugfix on + 0.2.7.2-alpha. diff --git a/changes/bug18368 b/changes/bug18368 new file mode 100644 index 0000000000..17218d432f --- /dev/null +++ b/changes/bug18368 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When logging information about an unparseable networkstatus vote or + consensus, do not say "vote" when we mean consensus. Fixes bug + 18368; bugfix on 0.2.0.8-alpha. + |