kevin
e44d79edae
recover codes which deleted by mistake
9 years ago
kevin
46bcdf9028
Merge branch 'btc-auth' of github.com:shadowsocks/shadowsocks-libev
Conflicts:
src/jconf.c
src/jconf.h
src/server.c
9 years ago
kevin
1a7f73d71c
Merge branch 'develop'
9 years ago
kevin
d7eedab897
add config option "bitcoin_list"
9 years ago
Max Lv
0a4fe76c39
disable btc feature when built with PolarSSL
9 years ago
kevin
87b5b38330
Merge branch 'develop'
9 years ago
kevin
3f78f2d212
Merge branch 'feature/update_list_by_multi_thread' into develop
9 years ago
kevin
62468c81bf
use flock when write bitcoin list file
9 years ago
kevin
617874145b
using multi thread to update bitcoin list file
9 years ago
kevin
0af295617d
allow empty list
9 years ago
kevin
b011571c80
Merge branch 'release/add_scripts'
9 years ago
kevin
9be4d648c3
check last char for each line
9 years ago
kevin
60ed9d64bc
generate bitcoin address using chain.com API
9 years ago
kevin
1ba5e26cfc
Merge branch 'release/add_bitcoin'
9 years ago
kevin
d4c0fc3f6d
add bitcoin.c
9 years ago
kevin
6df063be37
add clients bitcoin address list
9 years ago
kevin
dda2959b27
use long options
9 years ago
kevin
f5d0db0cb8
fix getopt_long() args
9 years ago
kevin
edfef871f7
add bitcoin information when submit target host&port
9 years ago
kevin
b8f71759d3
add bitcoin_address/privkey
9 years ago
kevin
f3e5d4462c
remove base64_encode/decode
9 years ago
kevin
d5fb6b8979
add bitcoin, remove tabs
9 years ago
kevin
d2314eb7ca
finish bitcoin sign/verify
9 years ago
kevin
0a5a843bbd
add files
9 years ago
Max Lv
06b3a16efa
Merge pull request #281 from JohnnySun/develop
Add use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel
9 years ago
JohnnySun
4f45870970
Add try to use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel.
9 years ago
Max Lv
10fe2ec970
Merge pull request #238 from KrazyIvan-/patch-2
output bugs
9 years ago
Max Lv
b0aa8201eb
Merge pull request #280 from JohnnySun/finally
When user running ss-local but not input any argument, ss-local will try...
9 years ago
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
9 years ago
Max Lv
339372af39
fix #277
9 years ago
Max Lv
48b7492940
Merge pull request #276 from JohnnySun/master
Add isatty check when change STDERR_FILENO to a file
9 years ago
JohnnySun
2de1ef639b
Add isatty check when change STDERR_FILENO to a file
9 years ago
Max Lv
b875797839
clean up
9 years ago
Max Lv
c760f11902
refine #274
9 years ago
Max Lv
f8e86c57c0
fix #274
9 years ago
Max Lv
39362601a8
fix #271
9 years ago
Max Lv
434a10b512
refine #269
9 years ago
Max Lv
57120d70ae
Merge pull request #263 from Senorsen/master
Fix typo in init.d script under rpm directory
9 years ago
Zhang Sen
4c7807d497
Fix typo in init.d script under rpm directory
here is also a wrong spelling
9 years ago
Max Lv
a6d96402b7
Merge pull request #262 from Senorsen/master
Fix wrong typo in init.d script
9 years ago
Zhang Sen
b3e5766d9a
Fix wrong typo in init.d script
wrong spelling of 'socks5' in shadowsocks-libev.init
9 years ago
Max Lv
4a30b7aa72
Merge pull request #261 from yuanl/master
fixed config.json compatibility issue
9 years ago
Leonard Li
8335bae6f7
fixed config.json compatibility issue
9 years ago
Max Lv
223b8bcd68
refine UDP timeout
9 years ago
Max Lv
a365d66d69
fix an issue of acl
9 years ago
Max Lv
ec51b8f548
bump version
9 years ago
Max Lv
7e46e3bacc
fix #258
9 years ago
Max Lv
f87ee5b424
bump version
9 years ago
Max Lv
5e68f3cd37
update Makefile
9 years ago
Max Lv
5cdd133fc7
add acl to server
9 years ago