[tor-commits] [tor/master] Make sure that we are always a net participant when being a server

[nickm at torproject.org]

commit 53ccdb6945f0d4a9b27a9939211a3c9125ca4427
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 14 15:05:05 2018 -0500

    Make sure that we are always a net participant when being a server
    
    Otherwise, if we're dormant, and we set ORPort, nothing makes us become
    non-dormant.
---
 src/core/mainloop/mainloop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 9f45f3c86..2d12e2648 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -1515,7 +1515,8 @@ get_my_roles(const or_options_t *options)
                   options->ControlPort_set ||
                   options->OwningControllerFD != UINT64_MAX;
 
-  int is_net_participant = is_participating_on_network();
+  int is_net_participant = is_participating_on_network() ||
+    is_relay || is_hidden_service;
 
   if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE;
   if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;