fix certdir error issue
fix typo
bugfix for adblock
fix appspot.com
update to lastest proxy.pac
fixed char encoding on mac os.
Merge pull request #178 from cuixin/3.0

fixed char encoding on mac os.
Update proxy.ini
rewrite rc4
Merge pull request #179 from ChenShuang/fix-bugs

重写rc4模块的结构
Merge pull request #177 from cnfuyu/3.0

Update local/proxy.py
disable adblock when [pac]adblock is deleted.
typo
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0

Conflicts:
	local/proxy.pac