nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-01 08:15:05 -04:00
commit 9e57ffa520
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug18460 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (statistics):
- Include consensus downloads via IPv6 in directory-request statistics.
Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha.

4
src/or/directory.c
View File

@ -2960,10 +2960,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
} }
if (1) { if (1) {
struct in_addr in;
tor_addr_t addr; tor_addr_t addr;
if (tor_inet_aton((TO_CONN(conn))->address, &in)) { if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) {
tor_addr_from_ipv4h(&addr, ntohl(in.s_addr));
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS,
&addr, NULL, &addr, NULL,
time(NULL)); time(NULL));