diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:50:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:50:06 -0500 |
| commit | 08469a338ab524e233f357d46504338fd64dedf9 (patch) | |
| tree | 6a517a1b555e1662cd88e181bd45ef073483836d /src/or/circuitmux.h | |
| parent | 5e92646715f32cae4d4d7f4f9a0f09108b8ddd73 (diff) | |
| parent | 03b4dd92a4c359fb2f699c579ed6dbcd73981267 (diff) | |
| download | tor-08469a338ab524e233f357d46504338fd64dedf9.tar.gz tor-08469a338ab524e233f357d46504338fd64dedf9.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
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 42a46aaa47..bf93bb8cbf 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); |