[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9

[nickm at torproject.org]

commit 68dea082e728094e393ee7629854e5e8ad9bbe32
Merge: 43ebe54a2 f367453cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:46:26 2017 -0400

    Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9

 changes/bug22349 |  9 +++++++++
 src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 53 insertions(+), 12 deletions(-)