Merge branch 'tor-gitlab/mr/337'

2 files changed, 9 insertions, 0 deletions

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index ddd612bd74..69606c0d53 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -1820,6 +1820,12 @@ check_network_participation_callback(time_t now, const or_options_t *options)
     goto found_activity;
   }
 
+  /* If we aren't allowed to become dormant, then participation doesn't
+     matter */
+  if (! options->DormantTimeoutEnabled) {
+    goto found_activity;
+  }
+
   /* If we're running an onion service, we can't become dormant. */
   /* XXXX this would be nice to change, so that we can be dormant with a
    * service. */
diff --git a/src/core/mainloop/netstatus.c b/src/core/mainloop/netstatus.c
index e8755e07a8..b833149151 100644
--- a/src/core/mainloop/netstatus.c
+++ b/src/core/mainloop/netstatus.c
@@ -154,6 +154,9 @@ netstatus_load_from_state(const mainloop_state_t *state, time_t now)
     last_activity = now;
     participating_on_network = true;
   }
+  if (! get_options()->DormantTimeoutEnabled) {
+    participating_on_network = true;
+  }
   reset_user_activity(last_activity);
 }