commit 69264f96f3561c72d14c1e518ca84ad18557d905 Merge: e17dd46cf e3b7fd2a8 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 13 08:26:10 2018 -0500

Merge branch 'dormant_persist_squashed'

changes/ticket28624 | 5 +++ doc/tor.1.txt | 11 +++++- src/app/config/config.c | 1 + src/app/config/or_options_st.h | 4 +++ src/app/config/or_state_st.h | 7 ++++ src/app/config/statefile.c | 8 +++++ src/core/mainloop/mainloop.c | 26 ++++++--------- src/core/mainloop/netstatus.c | 59 ++++++++++++++++++++++++++++++++ src/core/mainloop/netstatus.h | 4 +++ src/lib/intmath/cmp.h | 3 ++ src/test/test_mainloop.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 188 insertions(+), 16 deletions(-)