[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug24137'

[nickm at torproject.org]

commit 0b4e59b7c6d28565bdea773a9711571acd81d85d
Merge: 45fb624e3 e24df5824
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:32:35 2017 -0500

    Merge remote-tracking branch 'sebastian/bug24137'

 changes/bug24137 |  3 +++
 src/or/dirserv.c | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)