[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73
Merge: 3d1a7d7dd 2ee04fc30
Author: teor <teor at torproject.org>
Date:   Tue Nov 12 10:07:46 2019 +1000

    Merge branch 'maint-0.4.2'
    
    "git merge --strategy ours", because:
    * 32295 is a quick fix for 0.4.2 only
    * 32404 has a better implementation for master