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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into maint-0.3.1

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