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

[nickm at torproject.org]

commit 9537966a0bd080ccc80b91c7b88c53009753239e
Merge: c55c75bc9 9769df89f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:15:14 2019 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2