[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

[teor at torproject.org]

commit 7b6be02a923075ec3966d967cca26eb8d16b645e
Merge: 48187248d 6b392c333
Author: teor <teor at torproject.org>
Date:   Thu Jan 30 07:55:12 2020 +1000

    Merge branch 'maint-0.4.1' into maint-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(-)