Merge remote-tracking branch 'origin/maint-0.2.4'

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

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

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

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