[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit 0bfdf9c64b11dc1e8880fb588818211d005d54e6
Merge: a5b9200a1 a7bd20eba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 15:09:28 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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