diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-26 19:47:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-26 19:47:48 -0400 |
| commit | 1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629 (patch) | |
| tree | 8fa74c18b6c01ea008fbfcb97fcf637166452cdf | |
| parent | 08cc2cc692ac12c64dff992d68ffde55c7b95202 (diff) | |
| parent | 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2 (diff) | |
| download | tor-1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629.tar.gz tor-1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -rw-r--r-- | changes/bug24904 | 4 | ||||
| -rw-r--r-- | src/or/channel.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug24904 b/changes/bug24904 new file mode 100644 index 0000000000..648d9a5834 --- /dev/null +++ b/changes/bug24904 @@ -0,0 +1,4 @@ + o Minor bugfix (channel, client): + - Better identify client connection when reporting to the geoip client + cache. Fixes bug 24904; bugfix on 0.3.1.7. + diff --git a/src/or/channel.c b/src/or/channel.c index ff1cfde2ad..a4740dd752 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1849,8 +1849,8 @@ channel_do_open_actions(channel_t *chan) circuit_build_times_network_is_live(get_circuit_build_times_mutable()); router_set_status(chan->identity_digest, 1); } else { - /* only report it to the geoip module if it's not a known router */ - if (!connection_or_digest_is_known_relay(chan->identity_digest)) { + /* only report it to the geoip module if it's a client */ + if (channel_is_client(chan)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); |