commit bcf29f46c6eba9246cf125799afe710e7c9c2f01 Merge: d7c35378d 5dbdca011 Author: teor teor@torproject.org Date: Mon Oct 21 09:45:30 2019 +1000

Merge branch 'maint-0.4.2' into release-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(-)