# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1430671119 -7200
# Node ID 9795b8cf14f1afd66192b82b2b36ec6d785c2c41
# Parent  127b9f0c61351ea200f28fa0f384d9e0eb668978# Parent  4f934cf03bc976086d04ea68d440affd5f3314c7
Merge 0.9->0.10

diff -r 127b9f0c6135 -r 9795b8cf14f1 net/dns.lua
--- a/net/dns.lua	Sat May 02 14:52:51 2015 +0200
+++ b/net/dns.lua	Sun May 03 18:38:39 2015 +0200
@@ -226,7 +226,7 @@
 
 
 function dns.random(...)    -- - - - - - - - - - - - - - - - - - -  dns.random
-	math.randomseed(math.floor(10000*socket.gettime()) % 0x100000000);
+	math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000);
 	dns.random = math.random;
 	return dns.random(...);
 end
diff -r 127b9f0c6135 -r 9795b8cf14f1 util/datamanager.lua
--- a/util/datamanager.lua	Sat May 02 14:52:51 2015 +0200
+++ b/util/datamanager.lua	Sun May 03 18:38:39 2015 +0200
@@ -293,7 +293,7 @@
 
 	local mode, err = lfs.attributes(store_dir, "mode");
 	if not mode then
-		return function() log("debug", err or (store_dir .. " does not exist")) end
+		return function() log("debug", "%s", err or (store_dir .. " does not exist")) end
 	end
 	local next, state = lfs.dir(store_dir);
 	return function(state)