diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:05:38 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:05:38 -0400 |
| commit | 474e4d2722d52cf225a88cb7b7c677273b8f50ac (patch) | |
| tree | 0ebc666681cfbce8655f72330c3139b02a2a5376 /src/or/circuitbuild.h | |
| parent | a58610a87e27e446b347f49e847da1cd460ffa81 (diff) | |
| parent | caba3bc57e2895a7c51a87e23fa783b9c48892a5 (diff) | |
| download | tor-474e4d2722d52cf225a88cb7b7c677273b8f50ac.tar.gz tor-474e4d2722d52cf225a88cb7b7c677273b8f50ac.zip | |
Merge commit 'mikeperry/bug1740' into maint-0.2.2
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 033dd79c4c..9a8e4c3879 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -24,6 +24,7 @@ origin_circuit_t *circuit_establish_circuit(uint8_t purpose, int circuit_handle_first_hop(origin_circuit_t *circ); void circuit_n_conn_done(or_connection_t *or_conn, int status); int inform_testing_reachability(void); +int circuit_timeout_want_to_count_circ(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); |