summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-08-28 03:47:18 -0400
committerRoger Dingledine <arma@torproject.org>2009-08-28 03:47:18 -0400
commit0bb59f1c38eef467a353faf1a30cf93b64209a27 (patch)
tree2c2a749c0b3284e023c2a14afbff7756f5f8ef5a /src/or
parent85e22a8adb8c4f833498d8ad824c3ed61ee61acb (diff)
parent64f393d56f8ff58223db56f3b8e64f0074877616 (diff)
downloadtor-0bb59f1c38eef467a353faf1a30cf93b64209a27.tar.gz
tor-0bb59f1c38eef467a353faf1a30cf93b64209a27.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/command.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/command.c b/src/or/command.c
index c36874be5c..98f093a72b 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -610,9 +610,11 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
conn->_base.address, (int)conn->_base.port,
apparent_skew>0 ? "ahead" : "behind", dbuf,
apparent_skew>0 ? "behind" : "ahead");
- control_event_general_status(LOG_WARN,
- "CLOCK_SKEW SKEW=%ld SOURCE=OR:%s:%d",
- apparent_skew, conn->_base.address, conn->_base.port);
+ if (severity == LOG_WARN) /* only tell the controller if an authority */
+ control_event_general_status(LOG_WARN,
+ "CLOCK_SKEW SKEW=%ld SOURCE=OR:%s:%d",
+ apparent_skew,
+ conn->_base.address, conn->_base.port);
}
/* XXX maybe act on my_apparent_addr, if the source is sufficiently