commit bf2b8fcb450de46603803e9b22a047c53e233f6f Merge: e3e38b5ba 6d188fb4c Author: teor teor@torproject.org Date: Wed Mar 27 12:31:33 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug29874 | 4 ++++ src/lib/process/process_win32.c | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-)