diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:43:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:43:06 -0500 |
| commit | 7d845976e3897fac8e78a4a26688ac57b660151b (patch) | |
| tree | 00e30b072370f3c2e96c5bdc65a05c570aeb83f7 /src/or/circuitmux.h | |
| parent | 877dd1d6c8038cdef48a12a128eb08ae02ac628b (diff) | |
| parent | 920208776052d2130557359a0a8077406c60dd21 (diff) | |
| download | tor-7d845976e3897fac8e78a4a26688ac57b660151b.tar.gz tor-7d845976e3897fac8e78a4a26688ac57b660151b.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8maint-0.2.8
Diffstat (limited to 'src/or/circuitmux.h')
| -rw-r--r-- | src/or/circuitmux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 00745ac4a1..f53abdd8c8 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -131,7 +131,7 @@ int64_t circuitmux_count_queued_destroy_cells(const channel_t *chan, /* Channel interface */ circuit_t * circuitmux_get_first_active_circuit(circuitmux_t *cmux, - cell_queue_t **destroy_queue_out); + destroy_cell_queue_t **destroy_queue_out); void circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, unsigned int n_cells); void circuitmux_notify_xmit_destroy(circuitmux_t *cmux); |