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

• 463ce07426 add verify_simple module breakwa11 2015-10-04 19:56:58 +08:00
• e9f005c926 Merge pull request #17 from falseen/path-1 BreakWa11 2015-09-30 01:27:29 +08:00
• 96a9a25eaa 多端口模式下支持每个端口定义不同的混淆协议 falseen 2015-09-30 01:01:19 +08:00
• 74972875ff tiny fix breakwa11 2015-09-28 17:48:27 +08:00
• f9cdf2090f add crc verify breakwa11 2015-09-26 22:33:11 +08:00
• e060fd5b4d tiny bug breakwa11 2015-09-26 00:04:08 +08:00
• 93c94fbe3c Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser breakwa11 2015-09-25 23:25:58 +08:00
• f9e8af6358 add random_head obfs breakwa11 2015-09-25 23:25:18 +08:00
• bbbb9995d8 Merge pull request #15 from falseen/path-1 BreakWa11 2015-09-25 23:24:19 +08:00
• 680c128c72 优化细节。 falseen 2015-09-25 23:17:01 +08:00
• 6f8fc5b77f remove thread module breakwa11 2015-09-25 22:17:34 +08:00
• 3e5cbb955e add obfs: 'tls_simple' breakwa11 2015-09-25 21:29:11 +08:00
• 71338a7385 fix on python3 http2 obfs breakwa11 2015-09-25 11:28:09 +08:00
• 2e3114f40f fix 'ord' bug replace 'xrange' support new protocol when run as a client breakwa11 2015-09-21 14:41:42 +08:00
• 9df46398d6 Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser breakwa11 2015-09-11 21:19:47 +08:00
• a723c2f05e add obfs plugin breakwa11 2015-09-11 21:17:48 +08:00
• ac19b91719 Merge pull request #11 from falseen/manyuser BreakWa11 2015-09-11 21:13:38 +08:00
• b6961974ba 兼容py3，修正语法错误，加载libcrypto模块失败时显示详细错误。 falseen 2015-09-11 20:23:27 +08:00
• 028fd57343 Merge b98bb347df into 938bba32a4 The Gitter Badger 2015-09-11 08:49:13 +00:00
• b98bb347df Added Gitter badge The Gitter Badger 2015-09-11 08:48:47 +00:00
• 5a5b897578 兼容py3，显示详细错误。 falseen 2015-09-10 02:00:43 +08:00
• 401da7815f Merge pull request #2 from breakwa11/manyuser Falseen 2015-09-06 19:18:41 +08:00
• 55d10ace01 simple reverse proxy breakwa11 2015-09-02 23:57:51 +08:00
• 56af51b43c log TCP header if parse error breakwa11 2015-09-01 16:58:05 +08:00
• 5249fd528c add FORCE_NEW_PROTOCOL switch breakwa11 2015-08-28 13:35:10 +08:00
• 61959945c3 revert encrypt.py new obfs header breakwa11 2015-08-27 16:41:00 +08:00
• 57f1743a4d Merge bf4a578453 into 938bba32a4 Lai Yingxiao 2015-08-27 01:49:58 +00:00
• bf4a578453 Update README Lai Yingxiao 2015-08-27 09:47:45 +08:00
• eeac613cfb 2.8.2 wingyiu 2015-08-22 15:05:12 +08:00
• 938bba32a4 remove rm clowwindy 2015-08-22 10:45:55 +08:00
• 6ee1d9415e fk WillGhost 2015-08-21 19:08:14 +08:00
• 5b450acfaa Update README.md clowwindy 2015-08-20 18:52:42 +08:00
• 61a0b2d1ac Update README.md clowwindy 2015-08-17 20:36:34 +08:00
• e52aa9db0c Merge pull request #335 from slayercat/master clowwindy 2015-08-17 11:05:58 +08:00
• ffed9b2cae dns_server config test 李林哲 2015-08-17 10:14:23 +08:00
• 0c4f79284e allow user to override system dnsserver with config. 李林哲 2015-05-11 09:32:40 +08:00
• eb033a8f6a Update README.md clowwindy 2015-08-16 19:53:31 +08:00
• f19d0ea6fd fix #425 clowwindy 2015-08-15 22:36:29 +08:00
• 928c26e4f2 fix some exceptions breakwa11 2015-08-15 12:47:14 +08:00
• 07cfca302e Merge pull request #1 from shadowsocks/master Sweet 2015-08-15 09:13:40 +08:00
• 9defba2d36 merge master 20150810 breakwa11 2015-08-12 14:37:17 +08:00
• da46866828 restart server quickly when change password breakwa11 2015-08-12 12:45:07 +08:00
• b32cc8f703 fix closing relays breakwa11 2015-08-12 12:32:20 +08:00
• 661fbbfb8b fix handle_event breakwa11 2015-08-12 01:10:28 +08:00
• a2bc6e1945 fix #414 clowwindy 2015-08-11 17:55:16 +08:00
• a3344d9f1c rename handle_event breakwa11 2015-08-11 11:34:01 +08:00
• e5e3102591 remove debug code add AddressMap for udp breakwa11 2015-08-10 12:47:37 +08:00
• 7c08101ce8 update CHANGES 2.8.2 clowwindy 2015-08-10 12:37:42 +08:00
• a434eef096 fix json decode issue clowwindy 2015-08-10 11:53:54 +08:00
• 3c1154923f fix json unicode issue in manager clowwindy 2015-08-10 00:05:22 +08:00
• c5dd081216 Update README.md clowwindy 2015-08-09 01:33:27 +08:00
• f04e268885 bump 2.8.1 2.8.1 clowwindy 2015-08-06 19:47:33 +08:00
• c8b3f71e1b respond ok to add and remove commands clowwindy 2015-08-06 19:44:59 +08:00
• 77f9979b2e Update CONTRIBUTING.md clowwindy 2015-08-06 17:24:51 +08:00
• 3576b3006c support IPv6 on control socket clowwindy 2015-08-06 15:13:29 +08:00
• 583b54f426 update CHANGES 2.8 clowwindy 2015-08-06 14:58:40 +08:00
• 6e5744829c fix asyncmgr.py breakwa11 2015-08-06 12:26:45 +08:00
• 5ed73c15f0 bump 2.8 clowwindy 2015-08-06 01:04:03 +08:00
• 249bcc0b29 refine unit test clowwindy 2015-08-06 00:52:25 +08:00
• 30efc30360 fix pyflakes clowwindy 2015-08-06 00:34:20 +08:00
• a8ae8ab373 add unit test for manager clowwindy 2015-08-05 23:59:33 +08:00
• 4f948b2286 fix password type in udprelay clowwindy 2015-08-05 23:59:14 +08:00
• d20a07192c allow manager to bind on unix socket clowwindy 2015-08-05 23:11:56 +08:00
• 9c3af61433 add statistics clowwindy 2015-08-05 22:43:21 +08:00
• e08845d6f3 fix manager clowwindy 2015-08-05 18:31:55 +08:00
• 956199efcd add control manager clowwindy 2015-08-05 18:12:38 +08:00
• a9ea55c396 new UDP over TCP protocol, merge master breakwa11 2015-08-05 16:24:14 +08:00
• 58df1d82d0 close poll object after loop stopped clowwindy 2015-08-03 23:54:30 +08:00
• baad209160 bump clowwindy 2015-08-03 01:41:15 +08:00
• 4211184886 remove unnecessary overwrite clowwindy 2015-08-03 01:40:18 +08:00
• 999a54168e update CHANGES 2.7 clowwindy 2015-08-02 17:45:48 +08:00
• d946ac8213 skip graceful restart test on Jenkins clowwindy 2015-08-02 17:33:13 +08:00
• 177c639b19 fix graceful restart test clowwindy 2015-08-02 15:12:41 +08:00
• b28de8e2f1 fix pyflakes clowwindy 2015-08-02 15:10:46 +08:00
• 02120e3402 optimize eventloop clowwindy 2015-08-02 14:45:15 +08:00
• 111acf66c1 fix graceful restart and add unit test clowwindy 2015-08-02 14:37:44 +08:00
• 9e959f75b0 Merge 59566ca7d2 into e8b2946999 ZhengfengRao 2015-08-02 02:10:57 +00:00
• e8b2946999 fix workers clowwindy 2015-08-01 19:09:29 +08:00
• d319fab5ca fix asyncdns unit test clowwindy 2015-08-01 18:58:57 +08:00
• 80102f3899 fix pyflakes clowwindy 2015-08-01 18:57:44 +08:00
• 4a8d0774b4 optimize performance for multiple ports clowwindy 2015-08-01 18:22:35 +08:00
• 59566ca7d2 fix bug in tcprelay:server socket closed but not set to empty, will got error in _handle_events() Zhengfeng Rao 2015-08-01 17:17:15 +08:00
• 6e45d4b5a4 Merge af5455c820 into 538c4d6cba wigl 2015-07-29 10:42:55 +00:00
• badba5ca1a Merge pull request #7 from shadowsocks/master MRunFoss 2015-07-28 17:24:57 +08:00
• d95e5ce680 Merge pull request #388 from cicku/patch-1 clowwindy 2015-07-27 15:03:50 +08:00
• 2555aa8e2b PEP8 indent Christopher Meng 2015-07-27 00:38:23 -04:00
• 469d9f7bfa merge master breakwa11 2015-07-14 19:02:52 +08:00
• 1bb0e51e8e refine tests clowwindy 2015-07-11 13:05:37 +08:00
• f7d69db6d1 bump clowwindy 2015-07-10 18:01:34 +08:00
• f55bd0302f update CHANGES 2.6.11 clowwindy 2015-07-10 17:59:52 +08:00
• 13a6bb007c cache DNS results in UDPRelay clowwindy 2015-07-10 17:39:24 +08:00
• 99b4121fd9 fix problem when UDP client requesting both IPv4 and IPv6 clowwindy 2015-07-10 17:32:31 +08:00
• c34c99450f fix UDP source port issue clowwindy 2015-07-10 16:58:04 +08:00
• 1a62694a3b add udp source port test clowwindy 2015-07-10 15:02:33 +08:00
• 69d369268a update run.sh, set working dir breakwa11 2015-07-09 16:42:46 +08:00
• f78f5b56e3 client_key change breakwa11 2015-07-02 15:21:05 +08:00
• 298e8a06c9 add getKeys in switchrule.py breakwa11 2015-07-01 10:55:24 +08:00
• a142b957a7 remove 'plan' & 'switch' breakwa11 2015-07-01 10:50:28 +08:00
• 3af426b13b remove tail breakwa11 2015-06-30 15:34:02 +08:00
• 543a5903a1 encrypt speed test breakwa11 2015-06-26 11:33:59 +08:00