commit c37f974b2001dfb9a29a9070ad27de1b6467c3d1 Merge: f954ae688 c1bf4260b Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 12:13:55 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/bug31614 | 9 +++++++++ src/lib/err/backtrace.c | 26 +++++++++++++++++++++++--- src/lib/log/log.c | 5 ++++- src/lib/sandbox/sandbox.c | 1 + 4 files changed, 37 insertions(+), 4 deletions(-)