[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9

[nickm at torproject.org]

commit ab415ae95081ab662225a4600b93f66e7b4baf7a
Merge: 666653758 c86013291
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:17:58 2017 -0500

    Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9

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