commit 7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe Merge: 2b9a907bd 02843c4a4 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 26 16:33:31 2018 -0500

Merge branch 'dormant_v2_squashed'

doc/tor.1.txt | 13 ++ src/app/config/config.c | 9 +- src/app/config/or_options_st.h | 10 ++ src/app/main/main.c | 15 ++ src/core/mainloop/connection.c | 13 ++ src/core/mainloop/connection.h | 1 + src/core/mainloop/mainloop.c | 319 +++++++++++++++++++++++++------------- src/core/mainloop/mainloop.h | 7 +- src/core/mainloop/netstatus.c | 73 +++++++++ src/core/mainloop/netstatus.h | 7 + src/core/mainloop/periodic.c | 22 ++- src/core/mainloop/periodic.h | 15 +- src/core/or/connection_edge.c | 11 ++ src/core/or/or.h | 2 + src/feature/client/dnsserv.c | 4 + src/feature/control/control.c | 4 +- src/feature/hibernate/hibernate.c | 22 ++- src/feature/hs/hs_service.c | 4 +- src/feature/hs/hs_service.h | 2 +- src/test/test_compat_libevent.c | 1 - src/test/test_mainloop.c | 145 ++++++++++++++++- src/test/test_options.c | 1 + src/test/test_periodic_event.c | 61 +++++--- 23 files changed, 604 insertions(+), 157 deletions(-)