[tor-commits] [metrics-lib/master] Rename some copied-and-pasted variables.