Merge branch 'maint-0.2.8'

changes/bug18460

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

src/or/directory.c

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