diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-07-06 00:48:45 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-07-06 00:48:45 -0400 |
| commit | 1eec073f1bd1203935afdaa10a3818b73a668fdc (patch) | |
| tree | de5b8cf9116bf3ffc63352cdc680ac23d0864e97 | |
| parent | f348c1c6baa56008bc826c3a16856c42777b5a65 (diff) | |
| parent | 4f749791730a9ac8e4e815546e0411e34dc222a9 (diff) | |
| download | tor-1eec073f1bd1203935afdaa10a3818b73a668fdc.tar.gz tor-1eec073f1bd1203935afdaa10a3818b73a668fdc.zip | |
Merge branch 'maint-0.2.2' into release-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 1140f3314e..a63e89b126 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1501,7 +1501,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 |