diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:40:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:40:35 -0400 |
| commit | 639766dbc39c37d9864b99bd024faa5967b22c80 (patch) | |
| tree | 12c560f0f1611a0fc20884198eb3e5efe6f167e6 /src/or/channel.c | |
| parent | a01e4a1a957bc6a500930bb1221adf3b916d65f9 (diff) | |
| parent | 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f (diff) | |
| download | tor-639766dbc39c37d9864b99bd024faa5967b22c80.tar.gz tor-639766dbc39c37d9864b99bd024faa5967b22c80.zip | |
Merge branch 'maint-0.3.1'
Resolve conflict with 23532 code.
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 44152ff457..9e482a2b37 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2715,7 +2715,7 @@ channel_do_open_actions(channel_t *chan) router_set_status(chan->identity_digest, 1); } else { /* only report it to the geoip module if it's not a known router */ - if (!router_get_by_id_digest(chan->identity_digest)) { + if (!connection_or_digest_is_known_relay(chan->identity_digest)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; if (chan->get_transport_name(chan, &transport_name) < 0) |