commit 7d9bea6a773cc18c4790883cb18e3e61131a4ab1 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 16:49:20 2018 -0400

But, actually move systemd_watchdog_timer free into mainloop.c --- src/core/mainloop/mainloop.c | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 4ab00f92d..306c78735 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2897,6 +2897,10 @@ tor_mainloop_free_all(void) mainloop_event_free(postloop_cleanup_ev); mainloop_event_free(handle_deferred_signewnym_ev);

+#ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); +#endif + stats_n_bytes_read = stats_n_bytes_written = 0;

memset(&global_bucket, 0, sizeof(global_bucket));