commit 6d188fb4cc026668502c0fb28e9bffaa098f84dc Merge: ca29cb397 4be522b2e Author: teor teor@torproject.org Date: Wed Mar 27 12:31:07 2019 +1000

Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0

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