diff options
| author | Taylor Yu <catalyst@torproject.org> | 2018-11-19 15:48:08 -0600 |
|---|---|---|
| committer | Taylor Yu <catalyst@torproject.org> | 2018-11-19 15:48:08 -0600 |
| commit | 0489288aa2ec62c84f612f80bb56883244af380d (patch) | |
| tree | f9e8af150189cb5dfb561b27a6b74d65970d3e0d | |
| parent | 3260914db06acd5a8a0b4f0e5991f8e318190dce (diff) | |
| download | tor-0489288aa2ec62c84f612f80bb56883244af380d.tar.gz tor-0489288aa2ec62c84f612f80bb56883244af380d.zip | |
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.
| -rw-r--r-- | changes/bug28524 | 4 | ||||
| -rw-r--r-- | src/feature/control/control.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug28524 b/changes/bug28524 new file mode 100644 index 0000000000..1cad700422 --- /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 f0db97dc89..795902e6f4 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; |