diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-10-06 07:50:57 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-10-06 07:50:57 +0000 |
| commit | d1b9de222e14de3bc664f45cc9824b27a57f6d06 (patch) | |
| tree | 417e50290f21299373d9dd9fac87e2799fa5b9d3 /src | |
| parent | b6e590a1a536008efb17b54dace481b49b5b14f5 (diff) | |
| download | tor-d1b9de222e14de3bc664f45cc9824b27a57f6d06.tar tor-d1b9de222e14de3bc664f45cc9824b27a57f6d06.tar.gz | |
cleanups, closer to a changelog
svn:r8606
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 4 | ||||
| -rw-r--r-- | src/or/dns.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index d874e18f5..0c69b0b23 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1041,8 +1041,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } else { /* Can we even end up here? -- weasel*/ source = NS_FROM_DIR_BY_FP; - log_warn(LD_BUG, "we received a networkstatus but we didn't ask " - "for it by fp/ nor did we ask for all."); + log_warn(LD_BUG, "We received a networkstatus but we didn't ask " + "for it by fp, nor did we ask for all."); } cp = body; while (*cp) { diff --git a/src/or/dns.c b/src/or/dns.c index a47290e73..60dca8b69 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -385,12 +385,13 @@ purge_expired_resolves(time_t now) assert_cache_ok(); } -/** Send a response to the RESOLVE request of a connection. answer_type must - * be one of RESOLVED_TYPE_(IPV4|ERROR|ERROR_TRANSIENT) +/** Send a response to the RESOLVE request of a connection. + * <b>answer_type</b> must be one of + * RESOLVED_TYPE_(IPV4|ERROR|ERROR_TRANSIENT). * * If <b>circ</b> is provided, and we have a cached answer, send the - * answer back along circ; otherwise, send the answer back along * - * <b>exitconn</b>'s attached circuit. + * answer back along circ; otherwise, send the answer back along + * <b>conn</b>'s attached circuit. */ static void send_resolved_cell(edge_connection_t *conn, or_circuit_t *circ, @@ -446,7 +447,7 @@ send_resolved_cell(edge_connection_t *conn, or_circuit_t *circ, * * If <b>circ</b> is provided, and we have a cached answer, send the * answer back along circ; otherwise, send the answer back along - * <b>exitconn</b>'s attached circuit. + * <b>conn</b>'s attached circuit. */ static void send_resolved_hostname_cell(edge_connection_t *conn, or_circuit_t *circ, |