[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit e9c93a3415fac4660f3976dfcd7cfd2db5502e58
Merge: fb0019daf 0a6f4627a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 08:29:52 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/ticket25947 |   4 ++
 changes/ticket25960 |   5 ++
 src/or/dirserv.c    |  33 +++++++++++--
 src/or/dirserv.h    |   3 +-
 src/test/test_dir.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 175 insertions(+), 9 deletions(-)