commit 2edad42fd8afa243c0261d1907e50e43329e6392 Merge: fbb74fb37 d2031f2c6 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:45:59 2017 -0500

Merge branch 'maint-0.3.1' into release-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(-)