commit cf92667b9ffb427f85584f95bc8fea389ab31885 Merge: 330ccb699 9c17a6d28 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 09:59:26 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug23817 | 3 + src/or/directory.c | 82 ++++++++----------------- src/or/directory.h | 44 ++++++++++++++ src/or/entrynodes.c | 121 +++++++++++++++++++++++++++++++++---- src/or/entrynodes.h | 33 +++++++--- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++ src/or/microdesc.h | 4 ++ src/or/networkstatus.c | 3 + src/or/scheduler.c | 7 ++- src/test/test_entrynodes.c | 146 +++++++++++++++++++++++++++++++++++++++------ 10 files changed, 447 insertions(+), 97 deletions(-)