diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-04 18:50:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-04 19:05:51 -0400 |
| commit | f68c042637d253dfb3160357ba2b9ec530cb48ef (patch) | |
| tree | 621b700acf4646a720d47b719b30d5ebf2d51ed1 /src/or/connection_edge.c | |
| parent | 41e8bee188571ca61c2f5628ea99dff34343d673 (diff) | |
| download | tor-f68c042637d253dfb3160357ba2b9ec530cb48ef.tar.gz tor-f68c042637d253dfb3160357ba2b9ec530cb48ef.zip | |
Resolve all currently pending DOCDOC items in master
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ca4bf3ffe4..4c29e06f73 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2673,12 +2673,12 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) return 0; } -/** Make an AP connection_t, make a new linked connection pair, and attach - * one side to the conn, connection_add it, initialize it to circuit_wait, - * and call connection_ap_handshake_attach_circuit(conn) on it. +/** Make an AP connection_t linked to the connection_t <b>partner</b>. make a + * new linked connection pair, and attach one side to the conn, connection_add + * it, initialize it to circuit_wait, and call + * connection_ap_handshake_attach_circuit(conn) on it. * - * Return the other end of the linked connection pair, or -1 if error. - * DOCDOC partner. + * Return the newly created end of the linked connection pair, or -1 if error. */ entry_connection_t * connection_ap_make_link(connection_t *partner, |