commit d780cd5fd428176ebf4a72610ec4066c18346c09 Merge: 4835fae 9e8c104 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 14 01:44:46 2013 -0400 Merge branch 'circuit_queue_cap-0.2.3-squashed' into maint-0.2.3 changes/bug9063 | 3 +++ src/or/or.h | 9 +++++++++ src/or/relay.c | 23 ++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-)