[tor-commits] [torbutton/maint-10.0] Merge remote-tracking branch 'acatgl/revert_eoy2020_maint' into maint-10.0