commit 8991280f89be0cb157efcaec82880040fba4031b Merge: 57999e330 6d188fb4c Author: teor teor@torproject.org Date: Wed Mar 27 12:31:37 2019 +1000

Merge branch 'maint-0.4.0'

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