diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
| commit | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (patch) | |
| tree | 06800a08323c179e6e38292ebba543165b0fb22d /src/or/connection_or.c | |
| parent | 415caba967b9b470623ab29230b820b3470a91e6 (diff) | |
| parent | 6617822b841e32d6339bac13c79dd5f2b566c3c6 (diff) | |
| download | tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.tar.gz tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 01cc160158..266a73c7fa 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -507,7 +507,7 @@ connection_or_init_conn_from_address(or_connection_t *conn, * Requires that both input connections are open; not is_bad_for_new_circs, * and not impossibly non-canonical. * - * If </b>forgive_new_connections</b> is true, then we do not call + * If <b>forgive_new_connections</b> is true, then we do not call * <b>a</b>better than <b>b</b> simply because b has no circuits, * unless b is also relatively old. */ |