diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:49:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:49:40 -0500 |
| commit | 03b4dd92a4c359fb2f699c579ed6dbcd73981267 (patch) | |
| tree | 7caabdc7ee7602fd6d217f8be8de723e1d94668e /src/or/circuitmux.h | |
| parent | 08ed0d79308b308f690b80d65b22be11a97caf09 (diff) | |
| parent | 79a50afa0e3dd44fc5ef80806ccda501fab5a718 (diff) | |
| download | tor-03b4dd92a4c359fb2f699c579ed6dbcd73981267.tar.gz tor-03b4dd92a4c359fb2f699c579ed6dbcd73981267.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
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); |