Merge branch 'bug18809_028_squashed' into maint-0.2.8

changes/bug18809

src/or/circuituse.c

src/or/connection.c

src/or/connection.h

src/or/directory.c

src/or/directory.h

src/or/main.c

src/or/microdesc.c

src/or/microdesc.h

src/or/networkstatus.c

src/or/networkstatus.h

src/test/test_connection.c

src/test/test_dir.c

src/test/test_routerlist.c