[tor-commits] [metrics-lib/master] Remove more deprecated code for #22154.