diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-20 11:15:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-20 11:39:17 -0400 |
| commit | 1df43aff41eb8198712af0aa14ec2d574b26682c (patch) | |
| tree | c266322db182ee294c0d3adf570474fc4e36871e /src/or/control.c | |
| parent | 853e73e815c1be9c9e533160f803de56e7d21147 (diff) | |
| download | tor-1df43aff41eb8198712af0aa14ec2d574b26682c.tar.gz tor-1df43aff41eb8198712af0aa14ec2d574b26682c.zip | |
Return instead of exiting in options_init_from_torrc()
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index ab164700e6..7b89a13707 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6571,8 +6571,7 @@ monitor_owning_controller_process(const char *process_spec) "owning controller: %s. Exiting.", msg); owning_controller_process_spec = NULL; - tor_cleanup(); - exit(1); // XXXX bad exit: or questionable, at least. + tor_shutdown_event_loop_and_exit(1); } } |