diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:22:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:22:13 -0400 |
| commit | 92b3fc9317c183d1566bc2361e11bafe96d003cd (patch) | |
| tree | 949c045ad67552f19533aeca80937145e184a37f | |
| parent | 04ce541f8894122cf8eea18ff9fa54a50e22d453 (diff) | |
| parent | a95cfb8a58cc17c217750b1c39cb5b1237e38aea (diff) | |
| download | tor-92b3fc9317c183d1566bc2361e11bafe96d003cd.tar.gz tor-92b3fc9317c183d1566bc2361e11bafe96d003cd.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -rw-r--r-- | changes/bug25512 | 5 | ||||
| -rw-r--r-- | src/or/control.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/changes/bug25512 b/changes/bug25512 new file mode 100644 index 0000000000..4b6491867e --- /dev/null +++ b/changes/bug25512 @@ -0,0 +1,5 @@ + o Minor bugfixes (restart-in-process): + - When shutting down, Tor now clears all the flags in the control.c + module. This should prevent a bug where authentication cookies + are not generated on restart. Fixes bug 25512; bugfix on 0.3.3.1-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 06360586ee..1898725025 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7610,6 +7610,14 @@ control_free_all(void) tor_event_free(flush_queued_events_event); flush_queued_events_event = NULL; } + 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 @@ -7620,4 +7628,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ - |