Merge branch 'feature12538_028_01_squashed'

changes/feature12538

doc/tor.1.txt

src/or/config.c

src/or/config.h

src/or/directory.c

src/or/directory.h

src/or/dirserv.c

src/or/dirvote.c

src/or/dirvote.h

src/or/networkstatus.c

src/or/networkstatus.h

src/or/nodelist.c

src/or/or.h

src/or/router.c

src/or/router.h

src/or/routerlist.c

src/or/routerlist.h

src/or/routerparse.c

src/test/include.am

src/test/test_dir.c