Commit Graph

Select branches

Hide Pull Requests

1.4

auth

dev

manyuser

master

#1

#2

#3

#3

#4

#5

#5

2.6

2.6.1

2.6.10

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

3.0.1

3.1.2

Mono Color

• 5e46aa0b47 check encryptor object BreakWa11 2015-11-03 18:17:16 +08:00
• 1ee344220a merge manyuser 2.6.13 master BreakWa11 2015-11-02 17:24:21 +08:00
• b606e19c0b fix default protocol setting BreakWa11 2015-11-02 19:42:45 +08:00
• bc419c4dc2 bump 2.6.13 BreakWa11 2015-11-02 17:00:35 +08:00
• b713690521 multiple-port setting BreakWa11 2015-11-02 16:48:24 +08:00
• cb17c7b3b5 let setting & code simple add "protocol" in config.json BreakWa11 2015-11-02 15:13:54 +08:00
• 032027c3ff fix test_command Falseen 2015-11-01 23:56:37 +08:00
• 0f7a0c5628 fix chmod Falseen 2015-11-01 23:02:01 +08:00
• a96e2cbb63 fix READEME and travis url Falseen 2015-11-01 22:26:03 +08:00
• 52391b9214 add test_udp_src Falseen 2015-11-01 22:00:25 +08:00
• 60e86c27c4 add setup.py and remove __init__.py Falseen 2015-11-01 21:38:27 +08:00
• 208f1462c3 fix manger test again Falseen 2015-11-01 20:41:52 +08:00
• 7d2b66766c add cymysql Falseen 2015-11-01 20:36:44 +08:00
• fcc7a4cf9b remove os.chdir(file_path) Falseen 2015-11-01 20:35:01 +08:00
• 72001556b5 remove m2.py Falseen 2015-11-01 19:46:18 +08:00
• 82b5980422 fix test files Falseen 2015-11-01 19:43:01 +08:00
• fe4b35fb0a remove coverage run -a Falseen 2015-11-01 19:36:20 +08:00
• c02fcbf746 refine time diff set to 5 min BreakWa11 2015-10-30 10:22:04 +08:00
• d9dc3ae0b5 rename to "dns_ipv6" log wrong UDP header package BreakWa11 2015-10-29 23:38:23 +08:00
• c0d1d666a4 add ipv6 config BreakWa11 2015-10-29 11:00:01 +08:00
• e6d7a12afe fix bugs dns working in both v4 & v6 connecting problem in windows BreakWa11 2015-10-28 22:28:24 +08:00
• 011415f710 auth package size not less than head size BreakWa11 2015-10-27 21:10:45 +08:00
• a681a72b16 a stupid bug BreakWa11 2015-10-27 19:14:23 +08:00
• 8ee4cd513a a stupid bug BreakWa11 2015-10-27 19:13:38 +08:00
• 2d695441d2 bump 2.6.12 breakwa11 2015-10-27 12:24:16 +08:00
• 5137377580 bump 2.6.12 BreakWa11 2015-10-27 12:24:11 +08:00
• 7df3152608 merge manyuser breakwa11 2015-10-27 12:19:05 +08:00
• f5fbf579e2 fix 'http2_simple' & 'tls_simple' BreakWa11 2015-10-27 10:02:53 +08:00
• 33d907cc08 fix 'http_simple' & 'random_head' BreakWa11 2015-10-26 23:48:11 +08:00
• eebd5c548e Merge pull request #26 from mengskysama/patch-6 BreakWa11 2015-10-26 17:02:39 +08:00
• b31a8ea3f3 auto get realpath BreakWa11 2015-10-26 16:53:16 +08:00
• 3db5a4918f 发现好多坑 mengskysama 2015-10-26 16:50:33 +08:00
• c8423e360d DNS request ipv6 first BreakWa11 2015-10-26 16:37:27 +08:00
• 6ee8035735 merge pr from mengskysama BreakWa11 2015-10-26 14:48:54 +08:00
• 59105f6e64 support auth_simple BreakWa11 2015-10-26 14:43:17 +08:00
• 1e41de7d0b Merge pull request #24 from mengskysama/patch-2 BreakWa11 2015-10-26 14:30:13 +08:00
• 9bb52acaf5 Merge pull request #25 from mengskysama/patch-4 BreakWa11 2015-10-26 14:29:02 +08:00
• b059b9ad85 memory leak mengskysama 2015-10-26 11:05:38 +08:00
• 418cadb945 Update lru_cache.py mengskysama 2015-10-26 10:57:22 +08:00
• 83c8b50ea2 add startup time in auth_simple BreakWa11 2015-10-23 22:23:59 +08:00
• 39dffa220f optimize code add logs add timestamp BreakWa11 2015-10-23 15:17:30 +08:00
• 0ba76b666d not redirect host to chn web add auth_simple BreakWa11 2015-10-22 15:55:38 +08:00
• 126afea524 delete buffer BreakWa11 2015-10-22 10:41:40 +08:00
• 3f66ec443f remove FORCE_NEW_PROTOCOL BreakWa11 2015-10-21 22:37:32 +08:00
• 041a5c1046 optimize decrypt first recv size < iv_len will cause decrypt error BreakWa11 2015-10-21 22:02:22 +08:00
• 79260ff4ab check duplicate port BreakWa11 2015-10-21 14:53:14 +08:00
• c18b002754 bump 2.6.11 breakwa11 2015-10-20 18:48:10 +08:00
• eec312cc4c bump 2.6.11 breakwa11 2015-10-20 18:47:31 +08:00
• 1bc0e60cfd merge manyuser branch breakwa11 2015-10-20 18:41:35 +08:00
• 6be40dbf1e Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser breakwa11 2015-10-20 17:25:41 +08:00
• 4551d5c268 shorter code breakwa11 2015-10-20 17:01:37 +08:00
• 612c1e2ab3 add obfs_param catch TCP&UDP exceptions verify_simple&verify_deflate support sub obfs breakwa11 2015-10-20 16:25:06 +08:00
• 8988926ec7 Merge pull request #20 from falseen/manyuser BreakWa11 2015-10-11 23:46:56 +08:00
• 6d963cea44 添加混淆插件参数"-o" falseen 2015-10-11 22:38:46 +08:00
• c73127d858 insert a reload step main thread run 'thread_db' directly insert a 'ulimit' command before run the server breakwa11 2015-10-10 19:47:50 +08:00
• 36dc8f9463 add verify_deflate breakwa11 2015-10-09 13:07:52 +08:00
• 3200b7d4fe merge manyuser branch breakwa11 2015-10-04 23:05:20 +08:00
• a597e61093 obfs plugins compatible version breakwa11 2015-10-04 22:59:45 +08:00
• 8f402277e6 merge manyuser branch breakwa11 2015-10-04 20:07:58 +08:00
• 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
• 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
• a37623b0b7 log TCP header if parse error breakwa11 2015-09-02 12:54:37 +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
• 5b6dec5940 merge manyuser branch breakwa11 2015-08-27 16:42:40 +08:00
• 61959945c3 revert encrypt.py new obfs header breakwa11 2015-08-27 16:41:00 +08:00
• 928c26e4f2 fix some exceptions breakwa11 2015-08-15 12:47:14 +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
• 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
• 6e5744829c fix asyncmgr.py breakwa11 2015-08-06 12:26:45 +08:00
• a38db829f2 new UDP over TCP protocol, merge master breakwa11 2015-08-05 16:26:21 +08:00
• a9ea55c396 new UDP over TCP protocol, merge master breakwa11 2015-08-05 16:24:14 +08:00
• d475076cdc listen ipv6 breakwa11 2015-07-14 19:03:50 +08:00
• 469d9f7bfa merge master breakwa11 2015-07-14 19:02:52 +08:00
• e751534234 Merge branch 'master' of shadowsocks/shadowsocks breakwa11 2015-07-12 12:52:06 +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