commit d038430a1409fbb28ea4d0b62654fc3cc7bb1f7a Merge: 9bf6da1 8eb3d81 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 17 12:49:29 2015 -0500 Merge branch 'bug14918' changes/bug14918 | 7 +++++++ src/or/nodelist.c | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-)