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