[tor-commits] [metrics-tasks/master] Add #6232 code written by gsathya and others.