commit 7d0e64016ea5b60f64b2f68029d7efa44f25c54d Merge: 2ee33765ae 5cd85feaa7 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 21 09:29:13 2020 -0400

Merge branch 'maint-0.4.4'

changes/bug40020 | 9 ++++++ src/app/main/main.c | 15 ++++++--- src/lib/sandbox/sandbox.c | 77 ++++++++++++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 7 +++++ 4 files changed, 100 insertions(+), 8 deletions(-)