commit 778e8e604d561a47ca6223a570a691b6dc81128e Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 22 09:59:51 2016 -0400

make changes files pass lintChanges as appropriate --- changes/bug17702 | 2 +- changes/bug18318_ed | 2 +- changes/bug18368 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/changes/bug17702 b/changes/bug17702 index 4fda36f..eddfe1e 100644 --- a/changes/bug17702 +++ b/changes/bug17702 @@ -1,4 +1,4 @@ - o Major bugfixes: + o Major bugfixes (voting): - 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. diff --git a/changes/bug18318_ed b/changes/bug18318_ed index af39234..268ad02 100644 --- a/changes/bug18318_ed +++ b/changes/bug18318_ed @@ -1,4 +1,4 @@ - o Major bugfixes: + o Major bugfixes (voting): - 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 diff --git a/changes/bug18368 b/changes/bug18368 index 17218d4..628831d 100644 --- a/changes/bug18368 +++ b/changes/bug18368 @@ -1,4 +1,4 @@ - o Minor bugfixes: + o Minor bugfixes (logging): - 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.