diff options
author | Roger Dingledine <arma@torproject.org> | 2011-07-06 00:49:11 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2011-07-06 00:49:11 -0400 |
commit | ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db (patch) | |
tree | 1d9cde4bb58c72aa5635d2a9624c944edb4ab9fe | |
parent | 7295ad18d5c7ca67f6eee6d71823fc071103b795 (diff) | |
parent | 4f749791730a9ac8e4e815546e0411e34dc222a9 (diff) | |
download | tor-ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db.tar tor-ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db.tar.gz |
Merge branch 'maint-0.2.2'
-rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index d16d1badd..4ec45bc08 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1502,7 +1502,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn) } /** If <b>verbose</b> is false, allocate and return a comma-separated list of - * the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also + * the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also * list information about link status in a more verbose format using spaces. * If <b>verbose_names</b> is false, give nicknames for Named routers and hex * digests for others; if <b>verbose_names</b> is true, use $DIGEST=Name style |