diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-14 10:24:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-14 10:24:46 -0400 |
| commit | 0e4fcd39966ac6f5273920a6a19a8527d891d78e (patch) | |
| tree | 93b8e5aadd8b017fccc9b71131398471336c16ba /src/app | |
| parent | e43ae24e7d8cc96eaed41b8e135232248ac39721 (diff) | |
| parent | 75d6609eb1b1503f28054479c92d4f9ad6fe617d (diff) | |
| download | tor-0e4fcd39966ac6f5273920a6a19a8527d891d78e.tar.gz tor-0e4fcd39966ac6f5273920a6a19a8527d891d78e.zip | |
Merge branch 'nss_27664'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 9882e74367..a557a2adbe 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1417,6 +1417,8 @@ options_act_reversible(const or_options_t *old_options, char **msg) * the subprocess. Libevent bases can't be reliably inherited across * processes. */ if (running_tor && options->RunAsDaemon) { + if (! start_daemon_has_been_called()) + crypto_prefork(); /* No need to roll back, since you can't change the value. */ if (start_daemon()) crypto_postfork(); |