aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-08 17:50:34 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-08 17:50:34 -0500
commit0340c02975a51410525507b92ee0b7f9e6e9d6f7 (patch)
treec05b52d44266d002ac2b9192c16b3d11f941300e /src/or/circuitbuild.h
parentb189c613bb27695753761d0851c17f521e8f00de (diff)
parent050bb67974c11e0f390f4b1fa1b067c86538c59e (diff)
downloadtor-0340c02975a51410525507b92ee0b7f9e6e9d6f7.tar.gz
tor-0340c02975a51410525507b92ee0b7f9e6e9d6f7.zip
Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
Diffstat (limited to 'src/or/circuitbuild.h')
-rw-r--r--src/or/circuitbuild.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 9b5fcc71ed..a85ef672f9 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -27,7 +27,7 @@ int circuit_handle_first_hop(origin_circuit_t *circ);
void circuit_n_chan_done(channel_t *chan, int status,
int close_origin_circuits);
int inform_testing_reachability(void);
-int circuit_timeout_want_to_count_circ(origin_circuit_t *circ);
+int circuit_timeout_want_to_count_circ(const origin_circuit_t *circ);
int circuit_send_next_onion_skin(origin_circuit_t *circ);
void circuit_note_clock_jumped(int seconds_elapsed);
int circuit_extend(cell_t *cell, circuit_t *circ);