commit 4715d818092e02f2c530b172b351d9a2d11df735 Merge: 2d2a0c411 e7029621d Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 10 09:38:38 2018 -0500

Merge remote-tracking branch 'teor/Bug-23966'

changes/ticket23966 | 5 +++++ src/or/nodelist.c | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-)