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

• 445a3c9c7e Add AEAD ciphers support (#775) Zou Yong 2017-03-04 14:37:29 +08:00
• bae7d7a0c2 fix str type under py3 破娃酱 2017-03-02 23:20:06 +08:00
• 426854ccba Merge branch 'master' into master Zou Yong 2017-03-02 22:31:33 +08:00
• c4731de532 Update README.md (#575) Elvis Wang 2017-03-02 21:28:16 +08:00
• e06819c124 add simple ss-tunnel to shadowsocks for dns forward (#759) Falseen 2017-03-02 21:20:04 +08:00
• 5c3d1de1a8 fix test_aes_256_gcm() Zou Yong 2017-03-02 18:55:18 +08:00
• aa633ec88a fix pep8 format Zou Yong 2017-03-02 18:54:55 +08:00
• 408d03c556 rename is_tunnel to _is_tunnel Falseen 2017-03-02 18:50:26 +08:00
• 6db9ebda49 remove unused import Zou Yong 2017-03-02 18:46:06 +08:00
• 1b4507162b remove abc requirement Zou Yong 2017-03-02 18:36:21 +08:00
• e73d4892a4 fix indent according pep8 Zou Yong 2017-03-02 18:24:59 +08:00
• 39b25e59b2 fix udp replay: decrypt_all return a list remove manager api Zou Yong 2017-03-02 18:21:18 +08:00
• b447c044c7 update add_header Falseen 2017-03-02 15:01:39 +08:00
• 3b9689aaa0 #775 fix UDP decrypt_all issue Zou Yong 2017-03-02 14:38:56 +08:00
• d5cf37ab67 Add manager api requirements Zou Yong 2017-03-02 01:40:44 +08:00
• 0a0af61181 fix test_encrypt_all Zou Yong 2017-03-02 01:36:21 +08:00
• b9e59e5761 update Falseen 2017-03-02 00:28:12 +08:00
• fb7af45d53 Merge branch 'master' into path-1 Falseen 2017-03-01 23:37:09 +08:00
• c9dae2ba57 remove "both_tunnel_local" and fix some error for tunnel Falseen 2017-03-01 23:32:14 +08:00
• ca2b6da07e Add AEAD ciphers support, add manger api Zou Yong 2017-03-01 23:10:34 +08:00
• fe13c20dc1 Correct spelling. (#755) ImPerat0R_ 2017-02-28 22:19:36 +08:00
• 8ac72b0b25 parse dns_servre in config (#739) hdl 2017-02-28 06:15:47 -08:00
• 57f55bf347 remove ss_header from tcprelay.py and update the "header_length" to udprelay.py Falseen 2017-02-20 19:38:24 +08:00
• e1b199fc44 add additional_ports in config using user's password as protocol param in multi-user mode 破娃酱 2017-02-19 10:27:25 +08:00
• 19027aeba8 fix pep8 for travis again Falseen 2017-02-18 00:15:40 +08:00
• d29baa3102 add tcp forward to tunnel and fix a bug for pack_addr from common.py Falseen 2017-02-17 23:39:28 +08:00
• 70c8373a0f changed "add socks5 header to data" to "add ss header to data" Falseen 2017-02-17 21:08:50 +08:00
• bfb5e93843 update config to _config for tunnel Falseen 2017-02-17 17:43:35 +08:00
• ac1883eb7f update pep8 for travis Falseen 2017-02-17 17:25:30 +08:00
• 64282b0018 update for tunnel Falseen 2017-02-17 17:16:58 +08:00
• 029000ff8d update the config name for tunnel Falseen 2017-02-17 16:52:43 +08:00
• 1951a0660c fix pep8 for travis Falseen 2017-02-17 03:32:39 +08:00
• 044354779a fix tunnel for run tunnel alone Falseen 2017-02-17 03:16:52 +08:00
• 6f57db82c2 update rename Falseen 2017-02-17 03:11:18 +08:00
• ec9ffbdf04 fix error about pep8 and pyflakes for travis Falseen 2017-02-17 02:41:10 +08:00
• 4d5f14986a add tunnel_udp_server.close to local.py and tunnel.py Falseen 2017-02-17 01:54:57 +08:00
• aa0d90f1be add config.json.example to shadowsocks Falseen 2017-02-17 01:22:22 +08:00
• f43914ba1d add simple ss-tunnel to shadowsocks for dns forward Falseen 2017-02-17 01:15:08 +08:00
• 1d06490579 add config.json to gitignore Falseen 2017-02-16 20:19:18 +08:00
• ff345bd4ff add vscode to .gitignore Falseen 2017-02-16 20:18:28 +08:00
• e2957e672e timeout set to 1 破娃酱 2017-02-14 23:28:49 +08:00
• f296751def bandwidth limit of the user 破娃酱 2017-02-14 21:36:38 +08:00
• c4c1cd6dc1 refine auth_aes128_* & http_* 破娃酱 2017-02-14 20:23:45 +08:00
• 74083af472 process DNS 破娃酱 2017-02-14 02:45:40 +08:00
• 6732244ddf lower latency 破娃酱 2017-02-13 02:14:21 +08:00
• 2723295101 fix CPU usage 破娃酱 2017-02-13 01:38:48 +08:00
• 85955d6e6d speed limit in KiB 破娃酱 2017-02-12 22:46:09 +08:00
• 72ca31dad9 add traffic control for each TCP connection 破娃酱 2017-02-12 22:35:26 +08:00
• 2750af4a2e optimize shell (#173) John 2017-02-12 01:56:02 +11:00
• 0fdd2fec83 Merge 710c93291e into ad39d957d7 Shengdun Hua 2017-02-08 13:07:16 +00:00
• 710c93291e just for learn Sheng 2017-02-08 20:59:33 +08:00
• 4285854152 Correct spelling. ImPerat0R_ 2017-02-08 15:14:26 +08:00
• 5a89d7429c Merge cee1b0be33 into 938bba32a4 Shengdun Hua 2017-02-08 05:56:55 +00:00
• cee1b0be33 Just for learn Sheng 2017-02-08 13:52:49 +08:00
• bf8bb8afe2 fix undefined variable bug (#171) John 2017-02-05 23:44:43 +11:00
• 5d479087a8 fix tls1.2_ticket_auth when it as a client 破娃酱 2017-02-05 19:18:50 +08:00
• 26b4d8bc18 Merge branch manyuser into dev 破娃酱 2017-02-05 15:38:08 +08:00
• 3014b0034c Update README.md (#169) Dwwwwww 2017-02-05 12:36:45 +08:00
• bf443d72ec refine add "glzjinmod" interface Esdeath 2017-02-04 13:01:18 +08:00
• 31aaea603a add "glzjinmod" interface 破娃酱 2017-02-02 19:50:55 +08:00
• 390be3bf8d random ticket size for client only 破娃酱 2017-02-02 19:05:18 +08:00
• e7a61a934f ignore SIGPIPE 破娃酱 2017-01-25 01:08:00 +08:00
• 96760ed438 not display RST error 破娃酱 2017-01-23 16:28:59 +08:00
• 00a31285ed encode protocol param to URL with -i 破娃酱 2017-01-22 13:54:56 +08:00
• e38b464649 parse dns_servre in config mac_vbox 2017-01-20 23:00:02 -08:00
• 68693d5ec7 fix bug under py3 破娃酱 2017-01-21 12:43:22 +08:00
• 85f3574845 Update README.md Anthony Wong 2017-01-20 02:11:58 +08:00
• 7cfbe49806 refine traffic log when redirect enable (#163) Esdeath 2017-01-18 07:05:15 -06:00
• 9c794624e0 fix auth_aes128_* client side 破娃酱 2017-01-18 17:00:09 +08:00
• ccacef1556 fix bug & update usage 破娃酱 2017-01-17 20:53:54 +08:00
• 75643635d4 change default setting 破娃酱 2017-01-15 10:05:29 +08:00
• 4048abaeff refine user transfer 破娃酱 2017-01-13 21:52:17 +08:00
• d4b7483ef0 modify mgr fast command 破娃酱 2017-01-12 22:06:20 +08:00
• ad892e1223 let 'transfer_enable' be an integer 破娃酱 2017-01-11 18:34:28 +08:00
• 2de2a553d7 multi-user for mudbjson mode 破娃酱 2017-01-11 14:45:37 +08:00
• 588d8ad8b3 fix auth_aes128_* client side 破娃酱 2017-01-11 14:43:24 +08:00
• 278ce30c66 update mu online client manager 破娃酱 2017-01-09 17:48:19 +08:00
• 25c66dab14 bump 破娃酱 2017-01-08 17:06:08 +08:00
• de67c11207 typo 破娃酱 2017-01-08 00:47:44 +08:00
• 4f52dffcc1 parse protocol_param in py3 破娃酱 2017-01-08 00:26:49 +08:00
• cd825c9c2c typo 破娃酱 2017-01-07 22:07:13 +08:00
• e6410c067b Don't clear file first when saving config file noisyfox 2017-01-07 21:10:49 +11:00
• f0b0a31baf Revert commit fd9214b334 noisyfox 2017-01-07 20:27:27 +11:00
• 6d53546f6e Use super() call noisyfox 2017-01-07 20:03:20 +11:00
• 8777152ec9 Run db thread as daemon so that all sub-thread will inherite this and be killed automatically if main thread crash noisyfox 2017-01-07 19:58:32 +11:00
• f05bea4e10 Fix crash on windows noisyfox 2017-01-07 19:34:39 +11:00
• 0bf1e46ace Update .gitignore noisyfox 2017-01-07 19:23:30 +11:00
• 0f8dd36297 Add initcfg.bat for windows noisyfox 2017-01-07 19:23:09 +11:00
• 498f71a21b Save json config as utf8 noisyfox 2017-01-07 19:22:36 +11:00
• 490ae12128 Fix mujson_mgr.py crash when MUDB_FILE doesn't exist noisyfox 2017-01-07 19:14:58 +11:00
• 84fd119f26 Fix mujson_mgr.py crash on windows noisyfox 2017-01-07 19:14:02 +11:00
• fd9214b334 Use space instead of tab for indent see PEP8 noisyfox 2017-01-07 18:50:12 +11:00
• b367ad0560 using '#' to split multi-user setting 破娃酱 2017-01-07 01:23:42 +08:00
• 0ca45be89d update MU auth_aes128_* protocol 破娃酱 2017-01-06 21:02:52 +08:00
• 959aad3f41 multiuser in single port protocol 破娃酱 2017-01-04 22:46:39 +08:00
• 22ce739a45 update readme 破娃酱 2017-01-04 19:40:47 +08:00
• 7c6d059f0c change default protocol to auth_aes128_md5 破娃酱 2017-01-04 01:25:23 +08:00
• 77155a5ee4 bump 破娃酱 2017-01-03 11:44:07 +08:00
• ad39d957d7 2.9.1 2.9.1 mengskysama 2017-01-01 23:08:59 -08:00
• 392e54e508 update regex to support hostnames containing underscore (#694) Lution 2017-01-02 14:56:57 +08:00