commit fd1bd5bdce6b4b58b2a23f42d71cf663f07ce861 Merge: 8d19118fd2 0c8c295963 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 29 12:37:08 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/bug40072 | 4 ++++ src/app/main/main.c | 8 ++++++-- src/lib/sandbox/sandbox.c | 10 +--------- 3 files changed, 11 insertions(+), 11 deletions(-)