diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-02-11 01:21:04 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-02-11 01:21:04 -0500 |
| commit | 1c5b19a31a4bbf52747cfc9c6be59a1ad9af6843 (patch) | |
| tree | 6fd101fb4973731ab4a6cb442585090206633eb3 /src/or/directory.c | |
| parent | c79a24f50521383221fcc9ec5c5871fb4d547383 (diff) | |
| parent | 9b745cdbf9cd7384e44e18bf40a3d2c9becbc345 (diff) | |
| download | tor-1c5b19a31a4bbf52747cfc9c6be59a1ad9af6843.tar.gz tor-1c5b19a31a4bbf52747cfc9c6be59a1ad9af6843.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index ca612024fd..7137fe1fab 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1585,9 +1585,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn) delta>0 ? "ahead" : "behind", dbuf, delta>0 ? "behind" : "ahead"); skewed = 1; /* don't check the recommended-versions line */ - control_event_general_status(trusted ? LOG_WARN : LOG_NOTICE, - "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d", - delta, conn->_base.address, conn->_base.port); + if (trusted) + control_event_general_status(LOG_WARN, + "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d", + delta, conn->_base.address, conn->_base.port); } else { log_debug(LD_HTTP, "Time on received directory is within tolerance; " "we are %ld seconds skewed. (That's okay.)", delta); |