Merge branch 'win64-7260'

Conflicts:
	src/or/dns.c

1 files changed, 8 insertions, 7 deletions

diff --git a/src/or/dns.c b/src/or/dns.c
index 870494a937..e279fbc3ba 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -890,19 +890,19 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve,
         pending_connection->next = resolve->pending_connections;
         resolve->pending_connections = pending_connection;
         *made_connection_pending_out = 1;
-        log_debug(LD_EXIT,"Connection (fd %d) waiting for pending DNS "
-                  "resolve of %s", exitconn->base_.s,
+        log_debug(LD_EXIT,"Connection (fd "TOR_SOCKET_T_FORMAT") waiting "
+                  "for pending DNS resolve of %s", exitconn->base_.s,
                   escaped_safe_str(exitconn->base_.address));
         return 0;
       case CACHE_STATE_CACHED:
-        log_debug(LD_EXIT,"Connection (fd %d) found cachedresult for %s",
+        log_debug(LD_EXIT,"Connection (fd "TOR_SOCKET_T_FORMAT") found "
+                  "cached answer for %s",
                   exitconn->base_.s,
                   escaped_safe_str(resolve->address));
 
         *resolve_out = resolve;
 
         return set_exitconn_info_from_resolve(exitconn, resolve, hostname_out);
-
       case CACHE_STATE_DONE:
         log_err(LD_BUG, "Found a 'DONE' dns resolve still in the cache.");
         tor_fragile_assert();
@@ -1114,7 +1114,7 @@ connection_dns_remove(edge_connection_t *conn)
   if (pend->conn == conn) {
     resolve->pending_connections = pend->next;
     tor_free(pend);
-    log_debug(LD_EXIT, "First connection (fd %d) no longer waiting "
+    log_debug(LD_EXIT, "First connection (fd "TOR_SOCKET_T_FORMAT") no longer waiting "
               "for resolve of %s",
               conn->base_.s,
               escaped_safe_str(conn->base_.address));
@@ -1126,7 +1126,8 @@ connection_dns_remove(edge_connection_t *conn)
         pend->next = victim->next;
         tor_free(victim);
         log_debug(LD_EXIT,
-                  "Connection (fd %d) no longer waiting for resolve of %s",
+                  "Connection (fd "TOR_SOCKET_T_FORMAT") no longer waiting "
+                  "for resolve of %s",
                   conn->base_.s, escaped_safe_str(conn->base_.address));
         return; /* more are pending */
       }
@@ -1968,7 +1969,7 @@ launch_wildcard_check(int min_len, int max_len, int is_ipv6,
 /** Launch attempts to resolve a bunch of known-good addresses (configured in
  * ServerDNSTestAddresses).  [Callback for a libevent timer] */
 static void
-launch_test_addresses(int fd, short event, void *args)
+launch_test_addresses(evutil_socket_t fd, short event, void *args)
 {
   const or_options_t *options = get_options();
   (void)fd;