commit 1e7c7870e87ff660d4dce0b381790993be0328eb Merge: 545c21e23 193c74faf Author: David Goulet dgoulet@torproject.org Date: Mon Sep 9 10:51:19 2019 -0400

Merge branch 'tor-github/pr/1287'

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(-)