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

[nickm at torproject.org]

commit ae1ebb5f44537acc04c0c0338c61b7bdf5a212dc
Merge: c11672820 d46f67ef0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:58:12 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug34078 | 5 +++++
 1 file changed, 5 insertions(+)