summaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-20 09:04:35 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-20 09:04:35 -0500
commit34cadefe3455d2536d207e62caaade6a723a0ddb (patch)
treeab267a01609116db0a8645d9e83d4d3136fcbf3c /src/feature
parent8183640ada0ccef0c1f123a312b99c87269a1cae (diff)
parent0489288aa2ec62c84f612f80bb56883244af380d (diff)
downloadtor-34cadefe3455d2536d207e62caaade6a723a0ddb.tar.gz
tor-34cadefe3455d2536d207e62caaade6a723a0ddb.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/control/control.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index b31b448e96..65822b9fdd 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -7885,8 +7885,12 @@ control_free_all(void)
flush_queued_events_event = NULL;
}
bootstrap_percent = BOOTSTRAP_STATUS_UNDEF;
+ bootstrap_phase = BOOTSTRAP_STATUS_UNDEF;
notice_bootstrap_percent = 0;
bootstrap_problems = 0;
+ bootstrap_first_orconn = 0;
+ bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF;
+ bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF;
authentication_cookie_is_set = 0;
global_event_mask = 0;
disable_log_messages = 0;