commit 0994050c4a766fad94ce5108e99d18b0a6200e5f Merge: 57c4af16f 95e3527df Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 18 12:32:29 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1426' into maint-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(-)