commit 4e5e973421ce17c1b4466722390f0e47bdeaa527 Merge: 42008ee72 3809036c6 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 14 12:12:37 2018 +0100 Merge remote-tracking branch 'public/restart_reset_bootstrap' src/or/control.c | 3 +++ src/or/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --cc src/or/main.c index 077d8f882,5869b2b4d..65340751e --- a/src/or/main.c +++ b/src/or/main.c @@@ -3520,9 -3391,31 +3527,34 @@@ tor_free_all(int postfork periodic_timer_free(second_timer); teardown_periodic_events(); periodic_timer_free(refill_timer); + tor_event_free(shutdown_did_not_work_event); + tor_event_free(initialize_periodic_events_event); + + #ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); + #endif + + global_read_bucket = global_write_bucket = 0; + global_relayed_read_bucket = global_relayed_write_bucket = 0; + stats_prev_global_read_bucket = stats_prev_global_write_bucket = 0; + stats_prev_n_read = stats_prev_n_written = 0; + stats_n_bytes_read = stats_n_bytes_written = 0; + time_of_process_start = 0; + time_of_last_signewnym = 0; + signewnym_is_pending = 0; + newnym_epoch = 0; + called_loop_once = 0; + main_loop_should_exit = 0; + main_loop_exit_value = 0; + can_complete_circuits = 0; + quiet_level = 0; + should_init_bridge_stats = 1; + dns_honesty_first_time = 1; + heartbeat_callback_first_time = 1; + n_libevent_errors = 0; + current_second = 0; + memset(&refill_timer_current_millisecond, 0, sizeof(struct timeval)); + if (!postfork) { release_lockfile(); }