commit c1bf4260b69fa4de09471e31994b7fa242dce872 Merge: d4dde249a 749c2e176 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 12:13:47 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1302' into maint-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(-)