diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:30:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:30:51 -0400 |
| commit | 3256627a4548c4977b834cc724689e0e9a960f06 (patch) | |
| tree | 28d665541febcd7fdef49da4e92bebbc00af2793 /src/or/control.c | |
| parent | 33f058a5ba6d57023b00db87c5c9480276bc7acc (diff) | |
| parent | f810a1afe990788cd8f944a515a493902df84ed1 (diff) | |
| download | tor-3256627a4548c4977b834cc724689e0e9a960f06.tar.gz tor-3256627a4548c4977b834cc724689e0e9a960f06.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/main.h
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index a3504ffd91..705bdc1682 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1231,7 +1231,9 @@ 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); + + process_signal(sig); + return 0; } |