Merge branch 'ticket961_squashed'

changes/ticket961

doc/tor.1.txt

src/or/config.c

src/or/hibernate.c

src/or/hibernate.h

src/or/or.h

src/or/router.c

src/or/status.c

src/test/include.am

src/test/test.c

src/test/test_accounting.c