# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1594382477 -3600
# Node ID fd735fe2fc50a8efbc33142f9e68dc86a789f0f2
# Parent  8ac958938e0f371990fa6f9a2cf03cc63761e0c6# Parent  1d8e1f7a587c625949aa53248b48ca1dc99358f6
Merge 0.11->trunk

diff -r 8ac958938e0f -r fd735fe2fc50 net/resolvers/basic.lua
--- a/net/resolvers/basic.lua	Fri Jul 10 03:33:37 2020 +0200
+++ b/net/resolvers/basic.lua	Fri Jul 10 13:01:17 2020 +0100
@@ -70,6 +70,7 @@
 local function new(hostname, port, conn_type, extra)
 	local ascii_host = idna_to_ascii(hostname);
 	local targets = nil;
+	conn_type = conn_type or "tcp";
 
 	local is_ip = inet_pton(hostname);
 	if not is_ip and hostname:sub(1,1) == '[' then
@@ -87,7 +88,7 @@
 	return setmetatable({
 		hostname = ascii_host;
 		port = port;
-		conn_type = conn_type or "tcp";
+		conn_type = conn_type;
 		extra = extra;
 		targets = targets;
 	}, resolver_mt);