commit 8c92d44622263d5d57a794a9bd1d8f78eb532a73 Merge: 8e690ce736 eab8e7af52 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 29 12:35:57 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4 src/app/main/main.c | 8 ++++++-- src/lib/sandbox/sandbox.c | 10 +--------- 2 files changed, 7 insertions(+), 11 deletions(-)