diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
| commit | fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4 (patch) | |
| tree | 0d0f0b0aa37423e8f36f11e8410849e48be59ba6 /src/or/config.c | |
| parent | 7a2b30fe16eacc040b3dd11f8c39c410628c2f43 (diff) | |
| parent | c81f64ab44f71a97649a44e10d6fcbf15aa8c835 (diff) | |
| download | tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.tar tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.tar.gz | |
Merge branch 'backtrace_squashed'
Conflicts:
src/common/sandbox.c
src/common/sandbox.h
src/common/util.c
src/or/main.c
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 87ad7d595..d348f1036 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1161,8 +1161,6 @@ options_act_reversible(const or_options_t *old_options, char **msg) goto rollback; } - sandbox_set_debugging_fd(get_err_logging_fd()); - commit: r = 0; if (logs_marked) { @@ -1172,6 +1170,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) add_callback_log(severity, control_event_logmsg); control_adjust_event_log_severity(); tor_free(severity); + tor_log_update_sigsafe_err_fds(); } if (get_min_log_level() >= LOG_INFO && get_min_log_level() != old_min_log_level) { |