diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-22 11:56:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-22 11:56:51 -0400 |
| commit | 4201a3735f21e257494b8d523ebb19059caf4da3 (patch) | |
| tree | b431f22c8f785e3c6d3fb0d9bdb89729a299db14 /src/or | |
| parent | 0adb8c83860699fee4ccd19a3cfa0c5abd2c4070 (diff) | |
| parent | 1d002a25a261237e4ad1e3d9f3701670be853e6f (diff) | |
| download | tor-4201a3735f21e257494b8d523ebb19059caf4da3.tar.gz tor-4201a3735f21e257494b8d523ebb19059caf4da3.zip | |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/eventdns.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c index 9b83e9d814..a4461a6fe7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1209,7 +1209,7 @@ options_need_geoip_info(or_options_t *options, const char **reason_out) if (routerset_usage && reason_out) { *reason_out = "We've been configured to use (or avoid) nodes in certain " - "contries, and we need GEOIP information to figure out which ones they " + "countries, and we need GEOIP information to figure out which ones they " "are."; } else if (bridge_usage && reason_out) { *reason_out = "We've been configured to see which countries can access " diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 4958b9ae30..cd1330314b 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -474,7 +474,7 @@ sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2, return 1; } -/* for debugging bug 929. XXXX021 */ +/* for debugging bug 929. XXXX022 */ static int _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to) { @@ -484,13 +484,13 @@ _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to) #define add_timeout_event(s, to) \ (_add_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, (to))) -/* for debugging bug 929. XXXX021 */ +/* for debugging bug 929. XXXX022 */ static int _del_timeout_event(u16 *lineno, struct event *ev, int line) { if (*lineno) { - log(EVDNS_LOG_WARN, - "BUG: Duplicate timeout event_del from line %d: first call " + log(EVDNS_LOG_DEBUG, + "Duplicate timeout event_del from line %d: first call " "was at %d.", line, (int)*lineno); return 0; } else { @@ -501,13 +501,13 @@ _del_timeout_event(u16 *lineno, struct event *ev, int line) #define del_timeout_event(s) \ (_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \ __LINE__)) -/* For debugging bug 929/957. XXXX021 */ +/* For debugging bug 929/957. XXXX022 */ static int _del_timeout_event_if_set(u16 *lineno, struct event *ev, int line) { if (*lineno == 0) { - log(EVDNS_LOG_WARN, - "BUG: Event that I thought was non-added as of line %d " + log(EVDNS_LOG_DEBUG, + "Event that I thought was non-added as of line %d " "was actually added on line %d", line, (int)*lineno); *lineno = line; |