[tor-commits] [tor/master] Merge branch 'remove_old_consensus_methods_2018_squashed'

[nickm at torproject.org]

commit 0e8ae82a8757fb8bb2850f1a3d59ad1dfb468556
Merge: 6773102c9 ade3c7400
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 22 20:01:09 2018 -0400

    Merge branch 'remove_old_consensus_methods_2018_squashed'

 changes/24378             |  8 ++++++
 src/or/dircollate.c       | 38 ++-----------------------
 src/or/dirvote.c          | 72 ++++++++++++++---------------------------------
 src/or/dirvote.h          | 48 +------------------------------
 src/or/networkstatus.c    |  2 +-
 src/or/routerparse.c      |  3 +-
 src/test/test_dir.c       | 48 ++++++++++---------------------
 src/test/test_microdesc.c | 45 -----------------------------
 8 files changed, 50 insertions(+), 214 deletions(-)