[tor-commits] [metrics-tasks/master] Merge remote-tracking branch 'asn/bug6232'