summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-03-28 14:45:47 -0400
committerNick Mathewson <nickm@torproject.org>2018-03-28 14:45:47 -0400
commit4c0e434f33d937f43b49dc707718d73e5aea23b7 (patch)
tree001ca26e23d56dda9c767b6b6bf65f3038f8ad22 /src
parentcb083b5d3e21307b2dd762a1e891b71a9bd69eda (diff)
parent3519d0c8086edeade8d550f230caa3f95e4d2cdb (diff)
downloadtor-4c0e434f33d937f43b49dc707718d73e5aea23b7.tar.gz
tor-4c0e434f33d937f43b49dc707718d73e5aea23b7.zip
Merge remote-tracking branch 'public/bug25512'
Diffstat (limited to 'src')
-rw-r--r--src/or/control.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index e2b6280790..2c8ac96f77 100644
--- 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