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

[nickm at torproject.org]

commit 3df37d7b6be4f7d6ece0cd12812595d5f91ea72f
Merge: 5edc72a45 bed3e8da9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 8 14:26:05 2018 -0400

    Merge branch 'bug26004_029_squashed'

 changes/ticket26004 |  5 +++++
 src/or/dirserv.c    | 12 ++++++++++++
 src/test/test_dir.c |  7 +++++++
 3 files changed, 24 insertions(+)