diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
| commit | 65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9 (patch) | |
| tree | 86e7a09ba27884359051963eb4097cc3a353413a /src/or/circuitlist.h | |
| parent | 47b7a279298c81137430527ed0a72c6a6d3fcd61 (diff) | |
| parent | 0bd53b8d87a5fd4691530b8cb54181037062b949 (diff) | |
| download | tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.tar.gz tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.zip | |
Merge remote-tracking branch 'rransom-tor/bug1297b-v2'
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 8ed089c81d..e2298c69af 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -33,8 +33,8 @@ int circuit_id_in_use_on_orconn(circid_t circ_id, or_connection_t *conn); circuit_t *circuit_get_by_edge_conn(edge_connection_t *conn); void circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason); origin_circuit_t *circuit_get_by_global_id(uint32_t id); -origin_circuit_t *circuit_get_by_rend_query_and_purpose(const char *rend_query, - uint8_t purpose); +origin_circuit_t *circuit_get_ready_rend_circ_by_rend_data( + const rend_data_t *rend_data); origin_circuit_t *circuit_get_next_by_pk_and_purpose(origin_circuit_t *start, const char *digest, uint8_t purpose); or_circuit_t *circuit_get_rendezvous(const char *cookie); |