commit 9e6147a40c10343b880be175c654a7258c5496ef Merge: 6cdb213 8571e86 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 18 09:21:16 2015 -0500 Merge remote-tracking branch 'yawning/bug14918' changes/bug14918 | 8 +++ src/or/nodelist.c | 160 +++++++++++++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 72 deletions(-)