commit 193c74faf9c4c4dd32789e89cfd3f40291842524 Merge: 7fa624537 abe1f4f23 Author: teor teor@torproject.org Date: Wed Sep 4 13:57:39 2019 +1000

Merge branch 'bug31571_041' into bug31571_master

changes/bug31571 | 7 +++++++ src/lib/err/backtrace.c | 42 +++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- 4 files changed, 48 insertions(+), 13 deletions(-)