torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into release-0.3.5

Browse Source
This commit is contained in:
Nick Mathewson
2018-11-20 09:04:35 -05:00
parent 2d227dcfcb 0489288aa2
commit 49e243f885
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug28524
+4
View File
@@ -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.
src/feature/control/control.c
+4
View File
@@ -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;