[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1379'

[nickm at torproject.org]

commit 58b87a2c596185b2b7ef84d49fecbc603b5467d0
Merge: 52194c868 56d0655ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 7 10:15:46 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1379'

 changes/bug31734        |  3 +++
 src/lib/err/backtrace.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 45 insertions(+), 6 deletions(-)