[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit a1f73cb93da40185f8c8ed055de47e7525e77a3f
Merge: 042116e1f 5dbdca011
Author: teor <teor at torproject.org>
Date:   Mon Oct 21 09:45:34 2019 +1000

    Merge branch 'maint-0.4.2'

 changes/bug31837        |  5 +++++
 src/lib/err/backtrace.c | 12 ++++++------
 src/test/test_rebind.py | 16 +++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)