commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382 Merge: 5dbb607e9 b9d81282e Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

changes/bug32877 | 4 ++++ src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+)