diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:17:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:17:03 -0400 |
| commit | a7a906603e0c7e3c8519a948b5adf43bfecf6f66 (patch) | |
| tree | 52667d1c33790b187e75895e5eb9ebacd51bba1b /src/or/control.c | |
| parent | b75d1daf40c0d104b8224df337949753a5e65e74 (diff) | |
| parent | 5114e3e44235ea39447eea37213c65413cdb1a2c (diff) | |
| download | tor-a7a906603e0c7e3c8519a948b5adf43bfecf6f66.tar.gz tor-a7a906603e0c7e3c8519a948b5adf43bfecf6f66.zip | |
Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 8f3af0bda1..bb1c3307af 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - control_signal_act(sig); + signal_callback(0,0,(void*)(uintptr_t)sig); + return 0; } |