# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1542501020 -3600
# Node ID fc2266339cd80fbd2382fac3ca6d77dacfa3d1a5
# Parent  28be90eb774ad4fc4a319050b5a6cd0537a1395f# Parent  f457edaab510c08f85daf26aed4e1b9f5b6a5621
Merge 0.11->trunk

diff -r 28be90eb774a -r fc2266339cd8 net/server_select.lua
--- a/net/server_select.lua	Sat Nov 17 15:48:32 2018 +0100
+++ b/net/server_select.lua	Sun Nov 18 01:30:20 2018 +0100
@@ -1016,7 +1016,7 @@
 		err = "luasec not found"
 	end
 	if not typ then
-		local n = inet_pton(addr);
+		local n = inet_pton(address);
 		if not n then return nil, "invalid-ip"; end
 		if #n == 16 then
 			typ = "tcp6";