commit 924d1ebb384f9a586e3b8fbf6eed12bf55db77f2 Merge: 3bfbeff80 7b6be02a9 Author: teor teor@torproject.org Date: Thu Jan 30 07:55:16 2020 +1000

Merge branch 'maint-0.4.2' into release-0.4.2

changes/bug29819 | 8 ++++++++ changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++ src/app/main/ntmain.c | 7 +++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 6 files changed, 25 insertions(+), 40 deletions(-)