Don't queue more cells as a middle relay than the spec allows to be in flight
Don't queue more cells as a middle relay than the spec allows to be in flight
Don't queue more cells as a middle relay than the spec allows to be in flight
Increase the limit so leaky pipe might work
Increase the limit so leaky pipe might work
Increase the limit so leaky pipe might work
Fix signed/unsigned comparison warning
Merge branch 'circuit_queue_cap-0.2.3-squashed' into maint-0.2.3
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Using "ours" strategy to avoid taking changes.
Merge branch 'circuit_queue_cap-0.2.4-squashed' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'

Using "ours" strategy to avoid taking commits
Merge branch 'circuit_queue_cap-0.2.5-squashed'

Conflicts:
	src/or/relay.c