aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitmux.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-21 10:58:20 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-21 10:58:20 -0500
commit89f40ba97a752f125ef7dbb057d64dd5e06a95db (patch)
tree38daafd54586fccdec8797cff158081d3e2f29c6 /src/or/circuitmux.h
parent2e0c22d58bbb16bb47fc36246116eec866e4b954 (diff)
parent7d845976e3897fac8e78a4a26688ac57b660151b (diff)
downloadtor-89f40ba97a752f125ef7dbb057d64dd5e06a95db.tar.gz
tor-89f40ba97a752f125ef7dbb057d64dd5e06a95db.zip
Merge branch 'maint-0.2.8' into release-0.2.8release-0.2.8
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 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);