Merge 0.9->0.10

diff --cc net/dns.lua
Simple merge

diff --cc net/server.lua
Simple merge

diff --cc net/server_select.lua
Simple merge

diff --cc plugins/mod_s2s/s2sout.lib.lua
Simple merge