diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-04-28 19:00:34 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-04-28 19:00:34 +0200 |
| commit | 4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d (patch) | |
| tree | c0f219599f0968d40ec486efacd4e91ee637bb01 /src/or/rendclient.h | |
| parent | 0130e7c9d2842ad58e1b84829aeab16a2efba3bb (diff) | |
| parent | 8a36f2125137dc31a0771a8eeac0f2bb8c1343d0 (diff) | |
| download | tor-4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d.tar.gz tor-4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d.zip | |
Merge branch 'bug3k_021' into bug3k_022
Conflicts:
src/or/or.h
src/or/rendclient.c
Diffstat (limited to 'src/or/rendclient.h')
| -rw-r--r-- | src/or/rendclient.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/rendclient.h b/src/or/rendclient.h index 3f2e58e30b..6910c1a97b 100644 --- a/src/or/rendclient.h +++ b/src/or/rendclient.h @@ -18,6 +18,7 @@ int rend_client_introduction_acked(origin_circuit_t *circ, const uint8_t *request, size_t request_len); void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query); +void rend_client_cancel_descriptor_fetches(void); int rend_client_remove_intro_point(extend_info_t *failed_intro, const rend_data_t *rend_query); int rend_client_rendezvous_acked(origin_circuit_t *circ, |