tor

commit 4c0e434f33d937f43b49dc707718d73e5aea23b7
parent cb083b5d3e21307b2dd762a1e891b71a9bd69eda
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 28 Mar 2018 14:45:47 -0400

Merge remote-tracking branch 'public/bug25512'

Diffstat:
A
changes/bug25512
 | 
5
+++++
M
src/or/control.c
 | 
5
+++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/changes/bug25512 b/changes/bug25512
@@ -0,0 +1,5 @@
+  o Minor bugfixes (restart-in-process):
+    - When shutting down, Tor now clears all the flags in the control.c
+      module. This should prevent a bug where authentication cookies
+      are not generated on restart. Fixes bug 25512; bugfix on 0.3.3.1-alpha.
+
diff --git a/src/or/control.c b/src/or/control.c
@@ -7605,6 +7605,11 @@ control_free_all(void)
   bootstrap_percent = BOOTSTRAP_STATUS_UNDEF;
   notice_bootstrap_percent = 0;
   bootstrap_problems = 0;
+  authentication_cookie_is_set = 0;
+  global_event_mask = 0;
+  disable_log_messages = 0;
+  memset(last_sent_bootstrap_message, 0, sizeof(last_sent_bootstrap_message));
+  flush_queued_event_pending = 0;
 }
 
 #ifdef TOR_UNIT_TESTS