Commit graph

Select branches

Hide pull requests

master

rm

#10

#10

#100

#100

#1000

#1000

#1003

#1003

#1009

#1042

#110

#110

#1129

#1129

#1152

#1152

#1161

#1171

#1171

#1211

#1211

#1212

#1212

#1297

#1297

#15

#15

#16

#16

#160

#160

#17

#17

#173

#175

#186

#189

#203

#205

#206

#207

#207

#208

#212

#212

#214

#232

#232

#237

#24

#24

#242

#242

#243

#243

#248

#249

#249

#256

#256

#257

#258

#258

#260

#260

#264

#264

#27

#27

#279

#28

#28

#288

#288

#291

#295

#3

#3

#305

#312

#314

#321

#321

#332

#333

#335

#35

#35

#36

#36

#361

#37

#37

#38

#38

#388

#393

#393

#396

#396

#397

#397

#4

#4

#402

#402

#404

#405

#41

#41

#418

#432

#433

#433

#434

#434

#435

#435

#436

#436

#447

#447

#481

#5

#5

#506

#506

#507

#528

#529

#529

#530

#530

#54

#54

#543

#566

#566

#575

#589

#589

#590

#596

#596

#597

#597

#601

#602

#602

#610

#614

#615

#62

#62

#632

#632

#642

#643

#644

#659

#674

#676

#677

#677

#68

#68

#694

#697

#70

#70

#72

#72

#734

#739

#754

#754

#755

#756

#756

#759

#775

#78

#78

#780

#784

#788

#788

#79

#791

#796

#798

#803

#812

#812

#813

#813

#814

#84

#84

#841

#849

#864

#864

#866

#87

#87

#873

#873

#897

#903

#903

#908

#908

#915

#915

#918

#921

#93

#93

#932

#947

#98

#98

2.6

2.6.1

2.6.10

2.6.11

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

2.7

2.8

2.8.1

2.8.2

2.9.0

2.9.1

Mono Color

• 29b8ea7d67 Dockerfile combine RUN command ficapy 2016-08-21 16:34:48 +08:00
• fa1df99b79 Merge 87053a262b into 6ef14e56db ficapy 2016-08-21 07:39:28 +00:00
• 87053a262b Dockfile add libsodium ficapy 2016-08-21 15:23:42 +08:00
• b3fcee662a fix unit_len in auth_sha1 破娃酱 2016-08-20 23:23:09 +08:00
• e1aa68029d log if no user 破娃酱 2016-08-20 23:12:34 +08:00
• 1e2445061f remove keep alive 破娃酱 2016-08-18 09:31:12 +08:00
• 6ef14e56db Add chacha20-ietf crypto (#590) smounives 2016-08-17 17:06:54 +08:00
• 2761d3aa3f Update sodium.py (#1) mengskysama 2016-08-17 16:57:16 +08:00
• 44ccb67e1d PEP8 smounives 2016-08-17 08:01:33 +00:00
• 20fded87ee fix chacha20-ietf smounives 2016-08-17 06:42:02 +00:00
• 0feb8b2eb3 Add chacha20-ietf crypto smounives 2016-08-17 05:06:59 +00:00
• 562c55cd20 Merge bdecdaf546 into 8e8ee5d490 smounives 2016-08-17 04:16:20 +00:00
• bdecdaf546 Update setup.py smounives 2016-08-17 12:12:40 +08:00
• 43c4a31e39 Add "chacha20-ietf" crypto smounives 2016-08-17 12:11:25 +08:00
• efea3e08cc fix error return 破娃酱 2016-08-16 19:11:50 +08:00
• f989fd4d37 fix error return 破娃酱 2016-08-16 14:02:11 +08:00
• a26019f9e6 fix online users 破娃酱 2016-08-15 14:24:28 +08:00
• 816d2f6298 remove tls_simple, fix tls1.2_ticket_auth 破娃酱 2016-08-15 12:49:52 +08:00
• 3ce6e6f714 fix transfer update 破娃酱 2016-08-13 23:36:00 +08:00
• 89413b0e88 Merge eeac613cfb into 938bba32a4 wingyiu 2016-08-10 09:14:07 +00:00
• 5bf7dc3441 Merge fd814b1531 into 938bba32a4 ifreefly 2016-08-10 09:12:42 +00:00
• b1aade8640 remove custom obfs_param & protocol_param BreakWa11 2016-08-06 18:26:56 +08:00
• d47905f01d fix name BreakWa11 2016-08-01 22:56:37 +08:00
• f3808a306f random choice a host name (http_simple/http_post/tls1.2_ticket_auth) BreakWa11 2016-08-01 21:42:43 +08:00
• e15030cc6e set KEEPIDLE on windows/mac osx BreakWa11 2016-08-01 13:19:24 +08:00
• 292865f625 Linux only BreakWa11 2016-07-30 11:45:47 +08:00
• f14461ea64 replace("=", "") BreakWa11 2016-07-30 09:58:01 +08:00
• 8da3bdc511 set KEEPALIVE except windows BreakWa11 2016-07-30 09:56:41 +08:00
• 25e9c131d4 change err return BreakWa11 2016-07-29 21:38:05 +08:00
• 9b314af84b Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser BreakWa11 2016-07-29 17:49:55 +08:00
• 4a291ff335 add keep alive setting BreakWa11 2016-07-29 17:19:30 +08:00
• ca41f18f42 Merge pull request #103 from ufbycd/manyuser 破娃酱 2016-07-29 12:23:34 +08:00
• 82df4524d1 fix host_list type BreakWa11 2016-07-28 23:18:18 +08:00
• 1121434a5f add shadowsocks.obfsplugin to setup.py for distribution chenss 2016-07-28 21:21:10 +08:00
• f0d6a5b41e log listening port over UDP BreakWa11 2016-07-27 18:09:57 +08:00
• 0213e78847 log listening port, remove auth_simple, redirect the same port BreakWa11 2016-07-27 14:23:48 +08:00
• 3c1e5029d7 Update README.md Elvis Wang 2016-07-26 10:17:07 +08:00
• a440a726f6 fix get node_id BreakWa11 2016-07-24 23:08:45 +08:00
• 3525d3d86a fix get node_id BreakWa11 2016-07-24 23:06:54 +08:00
• 2c4600cf0e fix get node_id BreakWa11 2016-07-24 22:55:08 +08:00
• b922d70a87 set pull flag BreakWa11 2016-07-24 17:39:16 +08:00
• 0ed10c73c9 remove dup close BreakWa11 2016-07-24 17:11:05 +08:00
• a6162496ad read traffic_rate from ss_node BreakWa11 2016-07-21 17:51:02 +08:00
• 0a7d71a393 using mysql.json to config mysql BreakWa11 2016-07-21 14:59:19 +08:00
• c3484b3375 fix uptime BreakWa11 2016-07-21 12:58:18 +08:00
• 9c80dee9da fix traffic & uptime BreakWa11 2016-07-21 11:35:27 +08:00
• 7bfafa7f3d fix cfg BreakWa11 2016-07-20 11:13:56 +08:00
• 794121f111 show port details BreakWa11 2016-07-19 21:29:07 +08:00
• 32957158b9 check decode remote_addr BreakWa11 2016-07-19 16:44:10 +08:00
• 9538afebff check decode remote_addr BreakWa11 2016-07-19 16:41:42 +08:00
• 3f6f16e4d6 change the counter of the online users BreakWa11 2016-07-19 16:14:19 +08:00
• e2bae5874c catch decode error BreakWa11 2016-07-19 15:43:02 +08:00
• 3fd0fbf1d0 mysql SSL connect mujson_mgr add obfs & protocol mapping BreakWa11 2016-07-19 15:26:17 +08:00
• 8e73f50ff5 fix http_post & http_simple redirect BreakWa11 2016-07-19 15:23:35 +08:00
• 6db1445d2a auto get ip, ignore 'enable' BreakWa11 2016-07-19 12:50:07 +08:00
• 8e8ee5d490 Update tcprelay.py 2.9.0 mengskysama 2016-07-18 23:31:51 +08:00
• f7afcd4df0 add ota help in local mengskysama 2016-07-18 23:00:00 +08:00
• 5709f7d901 fix a bug BreakWa11 2016-07-18 18:23:49 +08:00
• 68d0c8e260 auto get ip in mujson_mgr.py BreakWa11 2016-07-18 16:06:56 +08:00
• 1dbc5e780d fix column name BreakWa11 2016-07-18 15:40:41 +08:00
• 4fdd9ea0ab fix transfer update BreakWa11 2016-07-18 12:56:16 +08:00
• d8dda5042f change online user counter & note traffic BreakWa11 2016-07-16 18:26:04 +08:00
• 6255a1d321 fix mudbjson mode BreakWa11 2016-07-15 23:01:53 +08:00
• 783267dba0 support sspanelv3 node info & logs BreakWa11 2016-07-15 19:16:02 +08:00
• b812ab10bf fix reload module BreakWa11 2016-07-09 13:56:05 +08:00
• e45d5d308e custom tls time diff. not check time diff by default BreakWa11 2016-07-09 12:58:46 +08:00
• cd6dab188c avoid making mudb.json empty test more encryptor add rc4-md5-6 BreakWa11 2016-07-08 11:13:18 +08:00
• 45584dc4f5 display ssr link BreakWa11 2016-06-26 21:23:39 +08:00
• 50b11fff02 wait longer to keep safe BreakWa11 2016-06-25 14:14:55 +08:00
• 2621e5e564 fix mgr under py3 BreakWa11 2016-06-25 14:01:47 +08:00
• 050270a725 fix send back str type BreakWa11 2016-06-25 00:39:04 +08:00
• f5434bdbd0 process empty str BreakWa11 2016-06-25 00:17:41 +08:00
• 187f0de25a generate random password remove default users in mudb.json BreakWa11 2016-06-24 19:37:25 +08:00
• bd43069bcf sendback param of server_post_decrypt details of errors BreakWa11 2016-06-24 19:02:31 +08:00
• f58d76da47 fix spell BreakWa11 2016-06-23 13:58:30 +08:00
• 4b2adda440 print_server_help by default BreakWa11 2016-06-22 17:46:08 +08:00
• b344bc236b fix bytes BreakWa11 2016-06-22 17:37:51 +08:00
• 9b14c019bb obfs http_simple broken in some cases BreakWa11 2016-06-22 17:11:16 +08:00
• ad625cd899 custom dns ip & port with 'dns.conf' BreakWa11 2016-06-22 16:07:57 +08:00
• 7259b211c6 fix auth, refine log BreakWa11 2016-06-22 02:17:31 +08:00
• 3912ecba8e accept older connection id BreakWa11 2016-06-22 01:36:36 +08:00
• d2b6c34bdf accept older connection id BreakWa11 2016-06-22 01:32:35 +08:00
• 3d1d38aa0f fix connections stat mgr help info BreakWa11 2016-06-22 01:14:34 +08:00
• 3d56b040cf accept older connection id BreakWa11 2016-06-21 23:26:00 +08:00
• acb3eb2910 compatible python3 BreakWa11 2016-06-21 22:42:55 +08:00
• 44598a070d compatible python3 BreakWa11 2016-06-21 21:29:34 +08:00
• 8031337d65 compatible python3 BreakWa11 2016-06-21 21:04:41 +08:00
• 044e1539e9 fix clear command BreakWa11 2016-06-20 17:19:04 +08:00
• 268f6e23b4 fix mujson_mgr & add -f BreakWa11 2016-06-20 15:02:21 +08:00
• 9e64d1837c add mudbjson mgr BreakWa11 2016-06-20 14:52:02 +08:00
• 97785aae2e fix recv data bug BreakWa11 2016-06-16 22:42:23 +08:00
• 8556fd3c18 fix UDPRelay _forbidden_portset BreakWa11 2016-06-16 01:35:18 +08:00
• 2f8517190c ignore empty BreakWa11 2016-06-16 00:17:31 +08:00
• 5c1b90b774 custom 'forbidden_ip' for each user fix cmp for IPNetwork & PortRange BreakWa11 2016-06-15 18:34:05 +08:00
• 8cbca008c6 custom 'forbidden_port' for each user BreakWa11 2016-06-15 18:13:45 +08:00
• 72aab7701f fix a tiny bug BreakWa11 2016-06-15 17:29:05 +08:00
• d653c9bdb3 add forbidden_port BreakWa11 2016-06-15 17:09:12 +08:00
• 9e288c9ac0 supper local json database for mu BreakWa11 2016-06-14 22:21:23 +08:00
• 8dac9faa28 'obfs', 'protocol', 'method' leave blank that use the config of config.json BreakWa11 2016-06-14 14:06:52 +08:00
• 825aece219 fix char set BreakWa11 2016-06-12 23:06:40 +08:00