commit aa47cb6e0f6edb2adeb357d2da1b090a11430f96 Merge: 03dc0e19a 92fb09906 Author: teor <teor@torproject.org> Date: Thu Dec 5 10:13:57 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug31571 | 7 +++++++ changes/bug31810 | 4 ++++ src/lib/err/backtrace.c | 42 ++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 +++++++++++++++++++++++++++++ 8 files changed, 101 insertions(+), 21 deletions(-)