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/main.c | |
| parent | b4ead16d57fab6a8294a0bf374bfcdb0d6e02625 (diff) | |
| parent | bf67a60b86b92f94d0c8b3c13edf4e8ff965c324 (diff) | |
| download | tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.tar.gz tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.zip | |
Merge branch 'feature9503_squashed'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 4571f682ff..54c739c4fd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2163,6 +2163,10 @@ process_signal(uintptr_t sig) addressmap_clear_transient(); control_event_signal(sig); break; + case SIGHEARTBEAT: + log_heartbeat(time(NULL)); + control_event_signal(sig); + break; } } |