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

[nickm at torproject.org]

commit 7b7aa4f070565fda111991f0d49342c977e42f02
Merge: 664a2c075 16e94dc7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 08:06:54 2020 -0500

    Merge branch 'maint-0.4.2' into release-0.4.2

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