2 files changed, 16 insertions, 8 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 83d1e6a41a..a7896fafa5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2617,6 +2617,20 @@ do_hup(void)
   return 0;
 }
 
+/** Initialize some mainloop_event_t objects that we require. */
+STATIC void
+initialize_mainloop_events(void)
+{
+  if (!schedule_active_linked_connections_event) {
+    schedule_active_linked_connections_event =
+      mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL);
+  }
+  if (!postloop_cleanup_ev) {
+    postloop_cleanup_ev =
+      mainloop_event_postloop_new(postloop_cleanup_cb, NULL);
+  }
+}
+
 /** Tor main loop. */
 int
 do_main_loop(void)
@@ -2630,14 +2644,7 @@ do_main_loop(void)
     initialize_periodic_events();
   }
 
-  if (!schedule_active_linked_connections_event) {
-    schedule_active_linked_connections_event =
-      mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL);
-  }
-  if (!postloop_cleanup_ev) {
-    postloop_cleanup_ev =
-      mainloop_event_postloop_new(postloop_cleanup_cb, NULL);
-  }
+  initialize_mainloop_events();
 
   /* initialize dns resolve map, spawn workers if needed */
   if (dns_init() < 0) {
diff --git a/src/or/main.h b/src/or/main.h
index 4f3b84e302..33ef40ce40 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -97,6 +97,7 @@ extern token_bucket_rw_t global_relayed_bucket;
 
 #ifdef MAIN_PRIVATE
 STATIC void init_connection_lists(void);
+STATIC void initialize_mainloop_events(void);
 STATIC void close_closeable_connections(void);
 STATIC void initialize_periodic_events(void);
 STATIC void teardown_periodic_events(void);