Merge branch '3.0' of https://github.com/goagent/goagent into SayCV_goagent

Conflicts:
	local/ntlmaps.bat
Merge branch '3.0' of https://github.com/goagent/goagent into SayCV_goagent
refine dns
Update proxy.py
Update proxy.ini

ERROR - [Jun 21 16:52:18] 127.0.0.1:7663 "FWD CONNECT autoproxy-gfwlist.googlecode.com:443 HTTP/1.1"
 timeout('timed out',)
Merge pull request #26 from v3aqb/patch-2

Update proxy.ini
Merge branch '3.0' of https://github.com/goagent/goagent into SayCV_goagent

Conflicts:
	local/proxy.bat
	local/uvent.bat
添加Mac下的颜色支持
Merge pull request #27 from Hubertzhang/3.0

添加Mac下的颜色支持
added do_PATCH to proxy handler
Merge pull request #28 from arrix/support_http_patch

Support HTTP PATCH
add more dns blacklist
increase listen backlog
Update proxy.py
Merge branch '3.0' of https://github.com/goagent/goagent into SayCV_goagent
Merge branch 'SayCV_goagent' of https://github.com/SayCV/goagent into SayCV_goagent

Conflicts:
	local/proxy.ini
	local/proxy.py