[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

[teor at torproject.org]

commit 92fb0990675424cd04eb0b39b4ae157ac7f5385b
Merge: 46057ec5a aee966cb0
Author: teor <teor at torproject.org>
Date:   Thu Dec 5 10:13:53 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

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