[tor-commits] [tor/maint-0.2.3] Merge branch 'circuit_queue_cap-0.2.3-squashed' into maint-0.2.3