Merge branch 'bug2286_unit_test_squashed'

changes/bug2286

src/or/dirserv.c

src/or/dirserv.h

src/or/dirvote.c

src/or/dirvote.h

src/or/networkstatus.c

src/or/networkstatus.h

src/or/or.h

src/or/routerparse.c

src/or/routerparse.h

src/test/test_dir.c