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