diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-11-06 10:16:18 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-11-06 10:16:18 -0500 |
commit | d05780c1bb5bc171d14102cdbe7b630c65ff45e5 (patch) | |
tree | 22012a66b2b5742aff3cc6a41884402bcbd2cf5a | |
parent | 8c9b5bfb8c0d933fb76e41bb2f6790bd6185b8ff (diff) | |
parent | bebdd910580ba13de02743ecfedb34bd2b2842a4 (diff) | |
download | tor-d05780c1bb5bc171d14102cdbe7b630c65ff45e5.tar.gz tor-d05780c1bb5bc171d14102cdbe7b630c65ff45e5.zip |
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r-- | src/or/scheduler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1e..1438dc60f6 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } { |