Merge 0.10->trunk

2 files changed, 5 insertions, 5 deletions

diff --git a/util/ip.lua b/util/ip.lua
index ec3b4d7e..81a98ef7 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -51,15 +51,15 @@ local function toBits(ip)
 	if not ip:match(":$") then fields[#fields] = nil; end
 	for i, field in ipairs(fields) do
 		if field:len() == 0 and i ~= 1 and i ~= #fields then
-			for i = 1, 16 * (9 - #fields) do
+			for _ = 1, 16 * (9 - #fields) do
 				result = result .. "0";
 			end
 		else
-			for i = 1, 4 - field:len() do
+			for _ = 1, 4 - field:len() do
 				result = result .. "0000";
 			end
-			for i = 1, field:len() do
-				result = result .. hex2bits[field:sub(i,i)];
+			for j = 1, field:len() do
+				result = result .. hex2bits[field:sub(j, j)];
 			end
 		end
 	end
diff --git a/util/openssl.lua b/util/openssl.lua
index 33234a7d..abd90a84 100644
--- a/util/openssl.lua
+++ b/util/openssl.lua
@@ -70,7 +70,7 @@ function ssl_config:serialize()
 				end
 			end
 		elseif k == "distinguished_name" then
-			for i, k in ipairs(t[1] and t or DN_order) do
+			for _, k in ipairs(t[1] and t or DN_order) do
 				local v = t[k];
 				if v then
 					s = s .. ("%s = %s\n"):format(k, v);