commit 5c85ba3077a7ee90b2ac73b1b1afd6555e718382 Merge: 973a5db80 776208896 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 20 11:42:26 2018 -0500

Merge remote-tracking branch 'tor-github/pr/608'

src/lib/process/process_win32.c | 160 ++++++++++++++++++++++++++++------------ src/test/test_process_slow.c | 1 + 2 files changed, 114 insertions(+), 47 deletions(-)