commit 4e7f65ee5dfc735cf78f3e78c33bad5ce882af9e Merge: 2000d04cb 93fd924bd Author: Taylor Yu <catalyst@torproject.org> Date: Wed Oct 17 15:42:58 2018 -0500 Merge branch 'bug27800-033' into tor-034 changes/bug27800 | 4 ++++ src/or/nodelist.c | 37 +++++++++++++++++++++++++++++++++---- src/test/test_nodelist.c | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 65 insertions(+), 12 deletions(-)