[tor-commits] [tor/master] Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7

[nickm at torproject.org]

commit e1e62f9d5735da64dc1435d3a40db77f6229766a
Merge: 920e3d6 2f2fba8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 13:25:12 2016 -0400

    Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7

 changes/bug17668       |  5 ++++
 changes/bug17702       |  6 ++++
 changes/bug18318_ed    |  7 +++++
 changes/bug18368       |  5 ++++
 src/or/dircollate.c    | 78 ++++++++++++++++++++++++++++++++++++++++++++++----
 src/or/dircollate.h    | 24 ++++++++++++++--
 src/or/dirserv.c       | 75 +++++++++++++++++++++++++++++++++++++-----------
 src/or/dirserv.h       |  2 +-
 src/or/dirvote.c       | 35 ++++++++++++++++++++++
 src/or/dirvote.h       |  7 +++--
 src/or/networkstatus.c |  2 +-
 src/or/or.h            | 13 +++++++--
 src/or/routerparse.c   | 25 ++++++++--------
 13 files changed, 239 insertions(+), 45 deletions(-)