vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
clowwindy 2014-06-05 19:34:08 +08:00
commit a3748a292d
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
README.md
View file

@ -1,13 +1,15 @@
shadowsocks shadowsocks
=========== ===========
Current version: 2.0-pre [![Build Status]][Travis CI] [![PyPI version]][PyPI] [![Build Status]][Travis CI]
Current version: 2.0-pre
shadowsocks is a lightweight tunnel proxy that help you get through firewalls. shadowsocks is a lightweight tunnel proxy that help you get through firewalls.
2.0-pre is currently experimental. Please use [1.4.x]. 2.0-pre is currently experimental. Please use [1.4.x].
[中文说明] [中文说明][Chinese Readme]
Install Install
------- -------
@ -107,11 +109,13 @@ Also see [Troubleshooting]
[1.4.x]: https://github.com/clowwindy/shadowsocks/tree/1.4 [1.4.x]: https://github.com/clowwindy/shadowsocks/tree/1.4
[Build Status]: https://travis-ci.org/clowwindy/shadowsocks.png?branch=master [Build Status]: http://img.shields.io/travis/clowwindy/shadowsocks/master.svg?style=flat
[Travis CI]: https://travis-ci.org/clowwindy/shadowsocks [Chinese Readme]: https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
[TCP_FASTOPEN]: https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open
[Issue Tracker]: https://github.com/clowwindy/shadowsocks/issues?state=open
[GUI client]: https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients [GUI client]: https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients
[Issue Tracker]: https://github.com/clowwindy/shadowsocks/issues?state=open
[PyPI]: https://pypi.python.org/pypi/shadowsocks
[PyPI version]: http://img.shields.io/pypi/v/shadowsocks.svg?style=flat
[Supervisor]: https://github.com/clowwindy/shadowsocks/wiki/Configure-Shadowsocks-with-Supervisor [Supervisor]: https://github.com/clowwindy/shadowsocks/wiki/Configure-Shadowsocks-with-Supervisor
[TCP_FASTOPEN]: https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open
[Travis CI]: https://travis-ci.org/clowwindy/shadowsocks
[Troubleshooting]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting [Troubleshooting]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting
[中文说明]: https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E