。
Merge branch 'master' of github.com:intoblack/proxy-tool

Conflicts:
	ProxyData.py
	fileutil.py
添加线程池