From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 21 Sep 2018 20:49:20 +0000 (-0400)
Subject: But, actually move systemd_watchdog_timer free into mainloop.c
X-Git-Tag: tor-0.3.5.3-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d9bea6a773cc18c4790883cb18e3e61131a4ab1;p=thirdparty%2Ftor.git

But, actually move systemd_watchdog_timer free into mainloop.c
---

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 4ab00f92d7..306c78735b 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));