Merge branch 'maint-0.2.8'

changes/bug18481

changes/bug18716

doc/tor.1.txt

src/common/memarea.c

src/or/config.c

src/or/directory.c

src/or/networkstatus.c

src/or/or.h

src/test/test_options.c