Merge branch 'maint-0.3.2'

This commit is contained in:
Nick Mathewson 2017-11-06 10:16:19 -05:00
commit 02a4c641da

View File

@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan)
chan->global_identifier, chan->global_identifier,
channel_state_to_string(chan->state), channel_state_to_string(chan->state),
chan->scheduler_state, circuitmux_num_cells(chan->cmux), chan->scheduler_state, circuitmux_num_cells(chan->cmux),
outbuf_len); (unsigned long)outbuf_len);
} }
{ {