commit 46057ec5ae5ecc183fb7ed5060b8ba07ad235fb3 Merge: febbc236d ee8db8a2e Author: teor teor@torproject.org Date: Thu Dec 5 10:13:15 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0

changes/bug31810 | 4 ++++ src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 8 deletions(-)