[tor-commits] [onionperf/master] Restore #40004 fix that got lost during rebase.