[tor-commits] [tor/master] Fix double-typedef of or_circuit_t.