# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1574567196 -3600
# Node ID f2c9abc71f08750fc61659331b5ac9aada0edbc6
# Parent  1ee87b4979c29534fef03e0407ade5af6f723944# Parent  97c0f5fe5f41ad07ce507f7398f2830d8d36300e
Merge 0.11->trunk

diff -r 1ee87b4979c2 -r f2c9abc71f08 net/resolvers/basic.lua
--- a/net/resolvers/basic.lua	Sun Nov 24 04:43:14 2019 +0100
+++ b/net/resolvers/basic.lua	Sun Nov 24 04:46:36 2019 +0100
@@ -1,5 +1,6 @@
 local adns = require "net.adns";
 local inet_pton = require "util.net".pton;
+local inet_ntop = require "util.net".ntop;
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 local unpack = table.unpack or unpack; -- luacheck: ignore 113
 
@@ -64,6 +65,7 @@
 		is_ip = inet_pton(hostname:sub(2,-2));
 	end
 	if is_ip then
+		hostname = inet_ntop(is_ip);
 		if #is_ip == 16 then
 			targets = { { conn_type.."6", hostname, port, extra } };
 		elseif #is_ip == 4 then