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

[nickm at torproject.org]

commit cbc67241dbe79d57eb1708b504b18f0cf12aeef1
Merge: f98b59524 4c8af10f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:08:53 2019 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2