tor

commit 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2
parent ca2d9cbb937e70e3f69e88e4e6a00fc0f818340c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 26 Mar 2018 19:47:44 -0400

Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3

Diffstat:
A
changes/bug24904
 | 
4
++++
M
src/or/channel.c
 | 
4
++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/bug24904 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
@@ -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);