Merge remote-tracking branch 'neel/b25886c'

diff --cc src/or/nodelist.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/routerlist.h
Simple merge