commit 5a24ff0563ed916abffcde083019d23142197fdf Author: Andrea Shepard <andrea@torproject.org> Date: Wed Jan 22 02:50:40 2014 -0800 What the hell was I on? --- src/or/channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/channel.c b/src/or/channel.c index 18c236f..94cca5c 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2263,7 +2263,8 @@ channel_flush_some_cells(channel_t *chan, ssize_t num_cells) /* Now process the queue if necessary */ - if (q_len_after > q_len_before && num_cells < flushed) { + if ((q_len_after > q_len_before) && + (unlimited || (flushed < num_cells))) { flushed += channel_flush_some_cells_from_outgoing_queue(chan, (unlimited ? -1 : num_cells - flushed)); }