summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-17 09:25:23 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-17 09:25:23 -0400
commita053451ddf4899d35182cd18c50a13eceb27030a (patch)
tree6419d876b81e6479bd09b2460bd9ec884d66517a /src
parent494dea70063125c5ab78b45e91d24def47efac5a (diff)
parent7155ee849e64e0997c533e21789501244eadc766 (diff)
downloadtor-a053451ddf4899d35182cd18c50a13eceb27030a.tar.gz
tor-a053451ddf4899d35182cd18c50a13eceb27030a.zip
Merge remote-tracking branch 'isis/fix/circuitlist-docstring-typo'
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index bf7f8daca7..716024df6a 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -716,8 +716,8 @@ origin_circuit_new(void)
return circ;
}
-/** Allocate a new or_circuit_t, connected to <b>p_conn</b> as
- * <b>p_circ_id</b>. If <b>p_conn</b> is NULL, the circuit is unattached. */
+/** Allocate a new or_circuit_t, connected to <b>p_chan</b> as
+ * <b>p_circ_id</b>. If <b>p_chan</b> is NULL, the circuit is unattached. */
or_circuit_t *
or_circuit_new(circid_t p_circ_id, channel_t *p_chan)
{