Merge remote-tracking branch 'public/exit_carefully'

changes/bug23848

src/common/compat_libevent.h

src/or/config.c

src/or/connection_edge.c

src/or/control.c

src/or/hibernate.c

src/or/main.c

src/or/main.h

src/or/ntmain.c

src/test/test_keygen.sh