[tor-commits] [tor/master] Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.h