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

[nickm at torproject.org]

commit 91188540af1ce185e7aa7ab19467a42bc9ea7722
Merge: 89b9951ec 16bdb9e36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:18:02 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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