commit c64844243a22a8f7495df79edac525d7b67f1440 Merge: 4ded6981b aee966cb0 Author: teor teor@torproject.org Date: Thu Dec 5 10:13:49 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

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