summaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-15 14:40:35 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-15 14:40:35 -0400
commit639766dbc39c37d9864b99bd024faa5967b22c80 (patch)
tree12c560f0f1611a0fc20884198eb3e5efe6f167e6 /src/or/channeltls.c
parenta01e4a1a957bc6a500930bb1221adf3b916d65f9 (diff)
parent49b5ad6b75f5f9e223a92033d9b3930e3e1d132f (diff)
downloadtor-639766dbc39c37d9864b99bd024faa5967b22c80.tar.gz
tor-639766dbc39c37d9864b99bd024faa5967b22c80.zip
Merge branch 'maint-0.3.1'
Resolve conflict with 23532 code.
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index fe1e7e91d8..a08e7cdfdb 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1828,8 +1828,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
#define NETINFO_NOTICE_SKEW 3600
if (labs(apparent_skew) > NETINFO_NOTICE_SKEW &&
(started_here ||
- connection_or_digest_is_known_relay(identity_digest))) {
- int trusted = router_digest_is_trusted_dir(identity_digest);
+ connection_or_digest_is_known_relay(chan->conn->identity_digest))) {
+ int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,
"NETINFO cell", "OR");
}