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

[nickm at torproject.org]

commit 93d376d8b309f3e8c242ae562434c32cfdd0388f
Merge: 7902c2fa0 84c4a2bc3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:24:09 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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