commit d211b20fbf80c03818d99e99d68e5ae8a3884295 Merge: 2be3b8275 6b392c333 Author: teor <teor@torproject.org> Date: Thu Jan 30 07:55:09 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 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(-)