nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2018-03-26 19:47:44 -04:00
commit 841ed9dbb9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24904 Normal file
View File

@ -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.

4
src/or/channel.c
View File

@ -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);