commit d53f779853ee112ca152198f7695ac3b940719ae Merge: 996328f37 53f350182 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 2 10:07:13 2018 -0500 Merge remote-tracking branch 'teor/ticket24001' changes/ticket24001 | 4 ++++ src/or/nodelist.c | 7 +++++++ 2 files changed, 11 insertions(+)