commit d2031f2c602c40c3cc5f96a0fba27435203e83e2 Merge: ae608408e 69f93f806 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:45:54 2017 -0500

Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1

changes/bug23817 | 3 ++ src/or/directory.c | 40 ++++++++++------ src/or/directory.h | 7 ++- src/or/entrynodes.c | 121 ++++++++++++++++++++++++++++++++++++++++++++----- src/or/entrynodes.h | 39 +++++++++++----- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++++++++++++ src/or/microdesc.h | 6 ++- src/or/networkstatus.c | 3 ++ 8 files changed, 280 insertions(+), 40 deletions(-)