[tor-commits] [onionperf/master] Fix matching of tor_circuit ids