[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2

[teor at torproject.org]

commit 5dbdca011454d1d6c9e83bcc1a970ec3c4f368da
Merge: 5c8ecf364 0a5ce8280
Author: teor <teor at torproject.org>
Date:   Mon Oct 21 09:45:18 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2

 src/lib/err/backtrace.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)