Merge remote-tracking branch 'origin/master'

This commit is contained in:
clowwindy 2013-06-19 17:05:11 +08:00
commit da3981ac23

View file

@ -85,3 +85,10 @@ Troubleshooting
Since you can't specify Socks4 or Socks5 in IE settings, you may want to use a PAC(Proxy auto-config) script, or
just use Firefox instead.
License
-------
MIT
Bugs and Issues
----------------
Please visit [issue tracker](https://github.com/clowwindy/shadowsocks/issues?state=open)