diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-25 12:49:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-25 12:49:09 -0500 |
| commit | 3a91a08e212ac125215b9aff5ad1ae4102623ab9 (patch) | |
| tree | fa1de2fd1a983952a5be9707c9b21ff78e3a4e0d /src/or/control.c | |
| parent | b4ead16d57fab6a8294a0bf374bfcdb0d6e02625 (diff) | |
| parent | bf67a60b86b92f94d0c8b3c13edf4e8ff965c324 (diff) | |
| download | tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.tar.gz tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.zip | |
Merge branch 'feature9503_squashed'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 72c62277f6..dc67588d6a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1263,6 +1263,7 @@ static const struct signal_t signal_table[] = { { SIGTERM, "INT" }, { SIGNEWNYM, "NEWNYM" }, { SIGCLEARDNSCACHE, "CLEARDNSCACHE"}, + { SIGHEARTBEAT, "HEARTBEAT"}, { 0, NULL }, }; @@ -4454,6 +4455,9 @@ control_event_signal(uintptr_t signal) case SIGCLEARDNSCACHE: signal_string = "CLEARDNSCACHE"; break; + case SIGHEARTBEAT: + signal_string = "HEARTBEAT"; + break; default: log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", (unsigned long)signal); |