commit 8b27498f12f7e090ee6c887f11b939d095b3114d Merge: 1049cec5e 0994050c4 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 18 12:32:49 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)