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

[teor at torproject.org]

commit f98b59524c44843d992688562fde27cbbedc11f9
Merge: 8f84999f5 2318bb237
Author: teor <teor at torproject.org>
Date:   Tue Oct 22 20:48:20 2019 +1000

    Merge branch 'maint-0.4.1' into maint-0.4.2