local changes
Merge branch 'master' of https://github.com/xqpmjh/Trickle

Conflicts:
	openresty/lib/hosts.lua
local changes
dns module optimize