[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[nickm at torproject.org]

commit 13216f848a120760fa372b9ae8f6d0840f4a83ba
Merge: b062e0f0a 2d8d6d1eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 08:08:59 2020 -0500

    Merge branch 'maint-0.4.2'

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