Merge branch 'restart_nocrash'

1 files changed, 3 insertions, 1 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 7bc811e859..e5c10498c4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -805,6 +805,8 @@ static smartlist_t *configured_ports = NULL;
 /** True iff we're currently validating options, and any calls to
  * get_options() are likely to be bugs. */
 static int in_option_validation = 0;
+/* True iff we've initialized libevent */
+static int libevent_initialized = 0;
 
 /** Return the contents of our frontpage string, or NULL if not configured. */
 MOCK_IMPL(const char*,
@@ -995,6 +997,7 @@ config_free_all(void)
   tor_free(the_tor_version);
 
   have_parsed_cmdline = 0;
+  libevent_initialized = 0;
 }
 
 /** Make <b>address</b> -- a piece of information related to our operation as
@@ -1345,7 +1348,6 @@ options_act_reversible(const or_options_t *old_options, char **msg)
 {
   smartlist_t *new_listeners = smartlist_new();
   smartlist_t *replaced_listeners = smartlist_new();
-  static int libevent_initialized = 0;
   or_options_t *options = get_options_mutable();
   int running_tor = options->command == CMD_RUN_TOR;
   int set_conn_limit = 0;