aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitmux.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-21 10:54:05 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-21 10:54:05 -0500
commitb8a3602b2a7114f2027d4a3af27520b109762efd (patch)
treedf95deb87231b22a49d9db3623c64f71b52ae598 /src/or/circuitmux.h
parentbcc96c77de52ae7a8e73a6b139756e17f25e148d (diff)
parent84adb9fcca3d4e1954c1dd215a3e765c689d82b3 (diff)
downloadtor-b8a3602b2a7114f2027d4a3af27520b109762efd.tar.gz
tor-b8a3602b2a7114f2027d4a3af27520b109762efd.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/circuitmux.h')
-rw-r--r--src/or/circuitmux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h
index 255822946d..336e128c76 100644
--- a/src/or/circuitmux.h
+++ b/src/or/circuitmux.h
@@ -133,7 +133,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);