diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:06:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:06:07 -0400 |
| commit | 4aa4bce474e6fb3e52c0aecb48f3e5024576e693 (patch) | |
| tree | e50f755df4f2f7ee1fed7d11f0671abf46899e06 /src/or/circuituse.c | |
| parent | a7f93b509c9c24a4af6abdd946007bdf2d497d87 (diff) | |
| parent | c5226bfe1c26d2cbcc789c1074d8d925e7c7fea1 (diff) | |
| download | tor-4aa4bce474e6fb3e52c0aecb48f3e5024576e693.tar.gz tor-4aa4bce474e6fb3e52c0aecb48f3e5024576e693.zip | |
Merge remote-tracking branch 'rransom-tor/bug3335-v2'
Conflicts:
src/or/connection_edge.c
src/or/rendclient.c
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f7f080db13..26bc45173e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1589,6 +1589,13 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, /* assert_connection_ok(conn, time(NULL)); */ circ->p_streams = ENTRY_TO_EDGE_CONN(apconn); + if (connection_edge_is_rendezvous_stream(apconn)) { + /* We are attaching a stream to a rendezvous circuit. That means + * that an attempt to connect to a hidden service just + * succeeded. Tell rendclient.c. */ + rend_client_note_connection_attempt_ended(apconn->rend_data->onion_address); + } + if (cpath) { /* we were given one; use it */ tor_assert(cpath_is_on_circuit(circ, cpath)); } else { |