[tor-commits] [metrics-tasks/master] Move #5755 code to #6443.