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