commit 853e73e815c1be9c9e533160f803de56e7d21147 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 20 11:03:53 2017 -0400

Return from instead of exit()ing when ed25519 key check fails. --- src/or/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c index 8bfea7895..d47c8f4dd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1609,8 +1609,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options) if (new_signing_key < 0 || generate_ed_link_cert(options, now, new_signing_key > 0)) { log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); - tor_cleanup(); - exit(1); // XXXX bad exit + tor_shutdown_event_loop_and_exit(1); } } return 30;