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

[nickm at torproject.org]

commit 602f9565a932354c543353f5ab38079a8707b2ad
Merge: 5f78775a8 af33fdd7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:22:57 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23908   |  3 +++
 src/or/directory.c | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)