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

[nickm at torproject.org]

commit 24d8b931d0c003ef65317fbe01a9c40aa9c13323
Merge: 2d8b4f9c4 9537966a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:15:14 2019 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2