Merge branch 'dormant_v2_squashed'

doc/tor.1.txt

src/app/config/config.c

src/app/config/or_options_st.h

src/app/main/main.c

src/core/mainloop/connection.c

src/core/mainloop/connection.h

src/core/mainloop/mainloop.c

src/core/mainloop/mainloop.h

src/core/mainloop/netstatus.c

src/core/mainloop/netstatus.h

src/core/mainloop/periodic.c

src/core/mainloop/periodic.h

src/core/or/connection_edge.c

src/core/or/or.h

src/feature/client/dnsserv.c

src/feature/control/control.c

src/feature/hibernate/hibernate.c

src/feature/hs/hs_service.c

src/feature/hs/hs_service.h

src/test/test_compat_libevent.c