commit 0489288aa2ec62c84f612f80bb56883244af380d Author: Taylor Yu <catalyst@torproject.org> Date: Mon Nov 19 15:48:08 2018 -0600 Update control_free_all() for #27169 Reset the added bootstrap tracking state introduced by ticket 27169. Fixes bug 28524; bugfix on 0.3.5.1-alpha. --- changes/bug28524 | 4 ++++ src/feature/control/control.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug28524 b/changes/bug28524 new file mode 100644 index 000000000..1cad70042 --- /dev/null +++ b/changes/bug28524 @@ -0,0 +1,4 @@ + o Minor bugfixes (restart-in-process, boostrap): + - Add missing resets of bootstrap tracking state when shutting + down (regression caused by ticket 27169). Fixes bug 28524; + bugfix on 0.3.5.1-alpha. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index f0db97dc8..795902e6f 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7880,8 +7880,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;