[tor-commits] [tor/master] Merge branch 'bug26485_029_squashed' into maint-0.2.9

[nickm at torproject.org]

commit a321d72401348cc3c8a5c3e86b2506c5c2278acd
Merge: 6dafddd05 fd5dce0a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 15:01:03 2018 -0400

    Merge branch 'bug26485_029_squashed' into maint-0.2.9

 changes/bug26485    |  4 ++++
 src/or/config.c     |  9 ++++++++-
 src/or/dirserv.c    | 43 +++++++++++++++++++++++++++++++++++++------
 src/or/dirserv.h    |  3 +--
 src/or/dirvote.c    |  9 ++++++++-
 src/test/test_dir.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 110 insertions(+), 11 deletions(-)