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

[nickm at torproject.org]

commit 16bdb9e365ff43885a4d3b3478ebb224f5a26a33
Merge: 9092e9019 ab415ae95
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:18:02 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23470   |  6 ++++++
 src/or/directory.c | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)