diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-19 16:35:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-19 16:35:24 -0500 |
| commit | edd427a8ba7520b54b92b2d828410491eb3fc2ca (patch) | |
| tree | d9c45c95b7cb5baf2750d9101437e13f9291d30d /src/or/config.c | |
| parent | df4d5ebb7dfaac49915d7ef775fcbf242e6c688b (diff) | |
| parent | 65a27d95e750e118162f22797dc22c4d550b9fc8 (diff) | |
| download | tor-edd427a8ba7520b54b92b2d828410491eb3fc2ca.tar.gz tor-edd427a8ba7520b54b92b2d828410491eb3fc2ca.zip | |
Merge branch 'disable_signal_handlers'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index e5c10498c4..bd309bc87a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -572,6 +572,7 @@ static config_var_t option_vars_[] = { VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), + VAR("__DisableSignalHandlers", BOOL, DisableSignalHandlers, "0"), VAR("__LeaveStreamsUnattached",BOOL, LeaveStreamsUnattached, "0"), VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword, NULL), @@ -4697,6 +4698,7 @@ options_transition_allowed(const or_options_t *old, NO_CHANGE_BOOL(DisableDebuggerAttachment); NO_CHANGE_BOOL(NoExec); NO_CHANGE_INT(OwningControllerFD); + NO_CHANGE_BOOL(DisableSignalHandlers); if (sandbox_is_active()) { #define SB_NOCHANGE_STR(opt) \ |