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

[nickm at torproject.org]

commit 7d509bc17027172ff3000fbd56216c672fe5ac08
Merge: edbfcee2f d465bd27e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:46:28 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26007 |  5 +++++
 src/or/dirserv.c | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)