commit c476d30e8e1052a502e2c35d9ec044006b261a07 Merge: c37f974b2 9769df89f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31594 | 5 +++ src/lib/err/backtrace.c | 2 +- src/lib/err/torerr.c | 64 +++++++++++++++++++++++++++++++--- src/lib/err/torerr.h | 7 ++-- src/lib/err/torerr_sys.c | 5 ++- src/lib/log/log.c | 85 +++++++++++++++++++++++++++++++++++++++------ src/lib/log/log.h | 1 + src/lib/log/util_bug.c | 11 +++--- src/trunnel/trunnel-local.h | 1 + 9 files changed, 158 insertions(+), 23 deletions(-)