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

[nickm at torproject.org]

commit 9c17a6d28b4acf044f408a0c7211e051e238c797
Merge: 9fbc835f1 3a5ca47d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 09:58:12 2017 -0500

    Merge branch 'bug23817_tests_032' into maint-0.3.2

 src/or/directory.c         |  42 -------------
 src/or/directory.h         |  42 +++++++++++++
 src/test/test_entrynodes.c | 146 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 171 insertions(+), 59 deletions(-)