[tor-commits] [torbutton/master] Merge remote-tracking branch 'acatgl/revert_eoy2020'