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

[nickm at torproject.org]

commit 25a9eab04c0a58072e7c306da4c4cb108f12afae
Merge: 05f91b5d7 cbc67241d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:08:53 2019 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2