Merge branch 'maint-0.2.9'

changes/bug20472

src/or/circuitbuild.c

src/or/networkstatus.c

src/or/routerlist.c

src/or/routerlist.h