diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-06-25 15:04:07 -0700 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2011-06-25 15:04:07 -0700 |
| commit | c780bc4d0b30e05ce2212756d93315f5680035a7 (patch) | |
| tree | 4508b0a5e24c285f4d6b99426caaf499a9dcddfb /src/or/circuitlist.c | |
| parent | 0b536469ee8a6d437cd939cbcdaa56039e27cdcb (diff) | |
| parent | 93d52f6739d3bb184575aa53eab1562d2c80ee57 (diff) | |
| download | tor-c780bc4d0b30e05ce2212756d93315f5680035a7.tar.gz tor-c780bc4d0b30e05ce2212756d93315f5680035a7.zip | |
Merge branch 'bug3465-022' into bug3465-023
* bug3465-022:
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
Correct a comment
Fix minor comment issues
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 601b432f56..93f5fd3493 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -864,7 +864,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to <b>rend_query</b>, and + * - circ-\>rend_data-\>onion_address is equal to <b>rend_query</b>, and * - circ-\>purpose is equal to <b>purpose</b>. * * Return NULL if no such circuit exists. |