diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
| commit | a7cafb1ea9307864c94ad3e019af93d09d48350e (patch) | |
| tree | 1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /src/or/main.c | |
| parent | a58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff) | |
| parent | e07d328457b26babe89abdcc1d5a550ee8273462 (diff) | |
| download | tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz | |
Merge branch 'bug8746_v2_squashed'
Conflicts:
src/common/include.am
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 090503e07..1c49ba148 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -54,6 +54,7 @@ #include "routerparse.h" #include "statefile.h" #include "status.h" +#include "util_process.h" #include "ext_orport.h" #ifdef USE_DMALLOC #include <dmalloc.h> @@ -2109,8 +2110,7 @@ process_signal(uintptr_t sig) break; #ifdef SIGCHLD case SIGCHLD: - while (waitpid(-1,NULL,WNOHANG) > 0) ; /* keep reaping until no more - zombies */ + notify_pending_waitpid_callbacks(); break; #endif case SIGNEWNYM: { |