commit 783a44b2cd92fc98d9c2894945a5d11396e20e64 Merge: bc6769e0d f7306b16e Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 3 09:05:16 2017 -0400

Merge remote-tracking branch 'asn/bug23670'

changes/bug23670 | 3 +++ src/or/entrynodes.c | 41 ++++++++++++++++++++++++++++++----------- src/or/entrynodes.h | 8 +++++--- src/or/nodelist.c | 21 +++++++++++++-------- src/test/test_entrynodes.c | 21 +++++++++++++++++++++ 5 files changed, 72 insertions(+), 22 deletions(-)