Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-20 13:03:50 +00:00
Code Releases Activity
713 Commits 82 Branches 86 Tags
v2.2.1
Commit Graph
713 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Lv 50f80557d4 bump version v2.2.1 2015-05-10 21:26:21 +09:00
Max Lv d5765a8bbe fix incorrect p_len in ss_decrypt_all 2015-05-10 17:41:46 +08:00
Max Lv f3a46baa2d Update README.md 2015-05-06 12:00:14 +08:00
Max Lv 39f72a0545 Merge pull request #308 from shadowsocks/tproxy-int 
Add TPROXY support for redir mode
v2.2.0 		2015-05-05 14:42:04 +08:00
Max Lv 9431b9b0c3 Add TPROXY support for redir mode 2015-05-05 14:37:27 +08:00
Max Lv 1f7291b928 Merge pull request #306 from mbbill/patch-1 
Fixed typo
 2015-05-02 16:02:17 +08:00
Ming, Bai 840ac82f97 Fixed typo 2015-05-02 15:27:15 +08:00
Max Lv 1a3b56170d refine addr_header comparison 2015-04-13 14:37:44 +08:00
Max Lv d593ba75f1 Merge pull request #293 from was4444/master 
add `genrpm.sh' to build rpm easily
 2015-03-26 08:05:25 +08:00
cuckoo bf64d01a5f add `genrpm.sh' to build rpm easily 2015-03-25 21:16:54 +08:00
Max Lv 8585005eb8 Merge pull request #292 from was4444/master 
add `shadowsock-libev.spec' for rpm build
 2015-03-25 06:33:20 +08:00
cuckoo 9985aaa35f add rpm support 2015-03-24 23:55:41 +08:00
Max Lv 06b3a16efa Merge pull request #281 from JohnnySun/develop 
Add use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel
 2015-03-06 13:14:08 +08:00
JohnnySun 4f45870970 Add try to use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel. 2015-03-06 12:50:57 +08:00
Max Lv 10fe2ec970 Merge pull request #238 from KrazyIvan-/patch-2 
output bugs
 2015-03-06 11:31:50 +08:00
Max Lv b0aa8201eb Merge pull request #280 from JohnnySun/finally 
When user running ss-local but not input any argument, ss-local will try...
 2015-03-06 11:25:46 +08:00
JohnnySun cc639b18a4 When user running ss-local but not input any argument, ss-local will try to use ./config(if exist). 
bettter way.

change default config path as /etc/shadowsocks/config.json

When user running ss-local but not input any argument, ss-local will try to use ./config(if exist).

Fixed the indent
 2015-03-06 11:20:01 +08:00
Max Lv 339372af39 fix #277 2015-03-06 09:25:45 +08:00
Max Lv 48b7492940 Merge pull request #276 from JohnnySun/master 
Add isatty check when change STDERR_FILENO to a file
 2015-03-05 22:30:25 +08:00
JohnnySun 2de1ef639b Add isatty check when change STDERR_FILENO to a file 2015-03-05 21:32:05 +08:00
Max Lv b875797839 clean up 2015-03-05 14:16:28 +08:00
Max Lv c760f11902 refine #274 2015-03-05 12:05:53 +08:00
Max Lv f8e86c57c0 fix #274 2015-03-05 12:03:58 +08:00
Max Lv 39362601a8 fix #271 2015-03-01 16:55:44 +09:00
Max Lv 434a10b512 refine #269 2015-02-28 23:28:21 +08:00
Max Lv 57120d70ae Merge pull request #263 from Senorsen/master 
Fix typo in init.d script under rpm directory
 2015-02-14 16:04:02 +08:00
Zhang Sen 4c7807d497 Fix typo in init.d script under rpm directory 
here is also a wrong spelling
 2015-02-14 16:02:15 +08:00
Max Lv a6d96402b7 Merge pull request #262 from Senorsen/master 
Fix wrong typo in init.d script
 2015-02-14 15:52:34 +08:00
Zhang Sen b3e5766d9a Fix wrong typo in init.d script 
wrong spelling of 'socks5' in shadowsocks-libev.init
 2015-02-14 15:51:12 +08:00
Max Lv 4a30b7aa72 Merge pull request #261 from yuanl/master 
fixed config.json compatibility issue
 2015-02-11 10:27:41 +08:00
Leonard Li 8335bae6f7 fixed config.json compatibility issue 2015-02-11 09:57:21 +08:00
Max Lv 223b8bcd68 refine UDP timeout 2015-02-09 10:11:59 +08:00
Max Lv a365d66d69 fix an issue of acl v2.1.4 2015-02-08 20:38:31 +09:00
Max Lv ec51b8f548 bump version 2015-02-08 20:28:19 +09:00
Max Lv 7e46e3bacc fix #258 2015-02-08 19:23:42 +08:00
Max Lv f87ee5b424 bump version v2.1.3 2015-02-08 11:03:19 +09:00
Max Lv 5e68f3cd37 update Makefile 2015-02-08 10:56:31 +09:00
Max Lv 5cdd133fc7 add acl to server 2015-02-08 09:49:45 +08:00
Max Lv 6bb29ab5b1 refine #254 2015-02-05 22:26:40 +09:00
Max Lv 2b0acde7ec update init scripts for OpenWrt 2015-02-05 09:02:51 +08:00
Max Lv e93240cd88 Merge pull request #253 from leesah/master 
Dockerization
 2015-02-02 16:33:33 +08:00
Sah 5e3842b31c Dockerization 
- based on ubuntu image
- builds shadowsocks-libev from latest code
- more information can be found in README.md
 2015-01-31 20:59:23 +08:00
Max Lv 876893170e bump version v2.1.2 2015-01-31 18:57:31 +09:00
Max Lv 116db6c078 bind to 127.0.0.1 by default 2015-01-31 17:27:41 +08:00
Max Lv 601055e954 fix #250 2015-01-31 16:06:41 +08:00
Max Lv 13de972e04 Merge pull request #248 from draplater/patch-2 
update debian init script
 2015-01-30 21:53:08 +08:00
draplater a9613596c9 update debian init script 
run as root firstly, then switch to $USER by "-a" parameter, so that we can bind to port lower than 1024 when running as normal user.
 2015-01-30 21:47:17 +08:00
Max Lv fb856bd43c Merge pull request #246 from typcn/patch-1 
Update shadowsocks.h
 2015-01-28 19:35:56 +08:00
Niu Tengyu 1590bf67d8 Update shadowsocks.h 2015-01-28 19:33:47 +08:00
Max Lv 02050e49e7 Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev 
Conflicts:
	src/udprelay.c
 2015-01-27 20:48:56 +08:00