aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-06-14 11:01:04 -0400
committerNick Mathewson <nickm@torproject.org>2014-06-14 11:01:04 -0400
commita58d94fb7c6c304ecba930eaa7ebbade1d0686ab (patch)
tree7c36b6a4f13246cec4644ebebba223f774c7dcbf /src/or/circuitlist.h
parentcfca2a6037c139a82677a0ba2776d4ddf6ca6d04 (diff)
parent8f3e3279c198dd13c11ffd739ddf08dbe8b07762 (diff)
downloadtor-a58d94fb7c6c304ecba930eaa7ebbade1d0686ab.tar
tor-a58d94fb7c6c304ecba930eaa7ebbade1d0686ab.tar.gz
Merge branch 'bug12184_diagnostic_squashed'
Diffstat (limited to 'src/or/circuitlist.h')
-rw-r--r--src/or/circuitlist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index 916afba21..d48d7c396 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -28,6 +28,8 @@ void circuit_set_n_circid_chan(circuit_t *circ, circid_t id,
channel_t *chan);
void channel_mark_circid_unusable(channel_t *chan, circid_t id);
void channel_mark_circid_usable(channel_t *chan, circid_t id);
+time_t circuit_id_when_marked_unusable_on_channel(circid_t circ_id,
+ channel_t *chan);
void circuit_set_state(circuit_t *circ, uint8_t state);
void circuit_close_all_marked(void);
int32_t circuit_initial_package_window(void);