Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-26 02:33:41 +00:00
Code Releases Activity
729 Commits 82 Branches 86 Tags
btc-auth
Commit Graph
729 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Lv 3840cf62dc refine addr_header comparison 2015-04-13 14:33:52 +08:00
Max Lv ed53fb6c54 fix a security issue 2015-04-01 13:07:10 +08:00
Max Lv d1e80aa29f Merge pull request #287 from bitkevin/master 
add config option "bitcoin_list"
 2015-03-13 09:13:42 +08:00
kevin 4de3eca031 fix bug caused by a previous commit 2015-03-12 19:37:03 +08:00
kevin e44d79edae recover codes which deleted by mistake 2015-03-12 19:21:25 +08:00
kevin 46bcdf9028 Merge branch 'btc-auth' of github.com:shadowsocks/shadowsocks-libev 
Conflicts:
	src/jconf.c
	src/jconf.h
	src/server.c
 2015-03-12 19:04:57 +08:00
kevin 1a7f73d71c Merge branch 'develop' 2015-03-12 18:33:12 +08:00
kevin d7eedab897 add config option "bitcoin_list" 2015-03-12 18:32:36 +08:00
Max Lv 0a4fe76c39 disable btc feature when built with PolarSSL 2015-03-12 17:13:27 +08:00
kevin 87b5b38330 Merge branch 'develop' 2015-03-12 16:42:41 +08:00
kevin 3f78f2d212 Merge branch 'feature/update_list_by_multi_thread' into develop 2015-03-12 16:38:08 +08:00
kevin 62468c81bf use flock when write bitcoin list file 2015-03-12 16:34:16 +08:00
kevin 617874145b using multi thread to update bitcoin list file 2015-03-12 16:09:45 +08:00
kevin 0af295617d allow empty list 2015-03-12 13:07:02 +08:00
kevin b011571c80 Merge branch 'release/add_scripts' 2015-03-11 14:39:44 +08:00
kevin 9be4d648c3 check last char for each line 2015-03-11 14:33:13 +08:00
kevin 60ed9d64bc generate bitcoin address using chain.com API 2015-03-11 14:32:28 +08:00
kevin 1ba5e26cfc Merge branch 'release/add_bitcoin' 2015-03-10 18:17:24 +08:00
kevin d4c0fc3f6d add bitcoin.c 2015-03-10 18:07:01 +08:00
kevin 6df063be37 add clients bitcoin address list 2015-03-10 17:19:34 +08:00
kevin dda2959b27 use long options 2015-03-10 12:10:51 +08:00
kevin f5d0db0cb8 fix getopt_long() args 2015-03-10 11:31:50 +08:00
kevin edfef871f7 add bitcoin information when submit target host&port 2015-03-10 11:22:49 +08:00
kevin b8f71759d3 add bitcoin_address/privkey 2015-03-10 11:20:17 +08:00
kevin f3e5d4462c remove base64_encode/decode 2015-03-10 11:19:49 +08:00
kevin d5fb6b8979 add bitcoin, remove tabs 2015-03-10 11:19:18 +08:00
kevin d2314eb7ca finish bitcoin sign/verify 2015-03-09 15:49:33 +08:00
kevin 0a5a843bbd add files 2015-03-09 09:26:15 +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