[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0

[nickm at torproject.org]

commit 84c4a2bc3f5c7f593d61888cbff19a7264bf69d3
Merge: 7c68b2f1a ff7e8531e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:24:02 2017 -0400

    Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0

 changes/bug20270 |  6 ++++++
 src/or/dirserv.c | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)