Commit Graph

  • *
  • |\
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • | *
  • | |\
  • |/ /
  • | *
  • |/
  • | *
  • | |\
  • | | *
  • | |/
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • * | |
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | | |\
  • | | | *
  • | | | |\
  • | | |/ /
  • | | | *
  • | | | *
  • | | |/
  • | | | *
  • | | | |\
  • | |_|/ /
  • |/| | |
  • * | | |
  • * | | |
  • * | | |
  • | |/ /
  • |/| |
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | | *
  • | |/
  • |/|
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • | | | | *
  • | | | | |\
  • | |_|_|/ /
  • |/| | | |
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • |/ / /
  • | | | *
  • | |_|/
  • |/| |
  • | | *
  • | | *
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • | * |
  • |/ /
  • | | *
  • | | |\
  • | |/ /
  • |/| |
  • | | *
  • | |/
  • |/|
  • * |
  • |\ \
  • ae07f877 Merge pull request #257 from li3shiyi/master by clowwindy 2015-08-07 21:52:59 +0800
  • 33e06067 (refs/pull/257/head) 全局模式切换到PAC模式时,清除ProxyServer by li3shiyi 2015-08-07 18:22:23 +0800
  • 0f748bd9 启用系统代理时禁用“自动检测设置”,并且无必要时不清除原有代理服务器设置。 by li3shiyi 2015-08-07 15:12:36 +0800
  • 1fec3a12 Merge pull request #256 from JeffreyZhang105/master by clowwindy 2015-08-07 03:11:31 +0800
  • 5ed40c75 (refs/pull/256/head) Added list of servers in QRCode generate window to select. by Jeffrey Zhang 2015-08-07 00:53:07 +0800
  • fbbc9a70 Update README.md by clowwindy 2015-08-04 02:20:43 +0800
  • 45e0968d fix #238 by clowwindy 2015-08-04 02:17:37 -0700
  • e634b7ec remove unused var by clowwindy 2015-08-04 02:14:30 -0700
  • 7425e09e (tag: 2.5.2) fix log not scrolled to bottom when first shown by clowwindy 2015-08-04 02:08:48 -0700
  • e1a90da2 will not distinguish .Net 2.0 and 4.0 by clowwindy 2015-08-04 01:59:17 -0700
  • 6a5432c8 bump 2.5.2 by clowwindy 2015-08-04 01:39:35 -0700
  • 5acfadcd add log viewer by clowwindy 2015-08-04 01:39:07 -0700
  • 9901c2a5 upgrade to VS2015 and .Net 4.0 by clowwindy 2015-08-02 23:29:29 -0700
  • e038beee Update README.md by clowwindy 2015-08-02 22:38:19 +0800
  • c5c3bb28 (refs/pull/240/merge) Merge 50309a0fe3 into c66ede2f59 by GameXG 2015-07-27 05:39:37 +0000
  • 50309a0f (refs/pull/240/head) 修改socks5协议连接建立成功回复发送时间 by GameXG 2015-07-27 13:27:20 +0800
  • 6f5aa38d (refs/pull/237/merge) Merge cc43a3d083 into f33da19f06 by git-720516 2015-07-26 10:06:42 +0000
  • cc43a3d0 (refs/pull/237/head) Revert "debug system proxy" by git-720516 2015-07-26 17:17:55 +0800
  • c66ede2f fix a warning by clowwindy 2015-07-26 12:38:08 +0800
  • c54735e0 small fix by clowwindy 2015-07-26 12:37:42 +0800
  • 60dc9e7d (tag: 2.5.1) bump 2.5.1 by clowwindy 2015-07-26 12:32:35 +0800
  • 02f75f89 update CHANGES by clowwindy 2015-07-26 12:32:17 +0800
  • eda92b80 refine logs by clowwindy 2015-07-26 12:27:34 +0800
  • ccec6be2 prevent jittering and fix server settings update in HA by clowwindy 2015-07-26 12:08:28 +0800
  • 01c059c4 fix server index problem by clowwindy 2015-07-26 11:37:09 +0800
  • a0e79f37 fix #235 by clowwindy 2015-07-26 10:44:44 +0800
  • a2cd2a54 (tag: 2.5) update CHANGES by clowwindy 2015-07-25 19:20:17 +0800
  • 9332741e update README by clowwindy 2015-07-25 19:19:20 +0800
  • 1a68544f bump by clowwindy 2015-07-25 19:06:03 +0800
  • dafe33f7 fix a crash by clowwindy 2015-07-25 19:05:37 +0800
  • 008e3544 refine HA by clowwindy 2015-07-25 18:39:14 +0800
  • 449df102 add connect timeout by clowwindy 2015-07-25 17:40:08 +0800
  • cb5fece8 HA almost works by clowwindy 2015-07-25 16:22:28 +0800
  • 8c869ca3 add retry by clowwindy 2015-07-25 14:16:29 +0800
  • ddd46ed8 add HA by clowwindy 2015-07-22 16:55:23 +0800
  • 4afd5faf add load balancing by clowwindy 2015-07-22 15:58:39 +0800
  • da415148 fix zero IP by clowwindy 2015-07-11 20:31:30 +0800
  • 32fc0f37 Merge pull request #1 from shadowsocks/master by breakwa11 2015-07-12 00:14:01 +0800
  • f6cbf7b7 Update README.md by clowwindy 2015-07-11 19:58:43 +0800
  • c673f18f (tag: 2.4) update CHANGES by clowwindy 2015-07-11 19:47:26 +0800
  • ccce252d bump by clowwindy 2015-07-11 19:36:09 +0800
  • 544c9dc7 update generated code by clowwindy 2015-07-11 19:35:02 +0800
  • 21fda9e8 use GitHub releases instead of SourceForge by clowwindy 2015-07-11 19:31:43 +0800
  • 5906ddbc fix warnings by clowwindy 2015-07-11 18:50:10 +0800
  • f9f49552 add port check for 8123 by clowwindy 2015-07-11 18:38:45 +0800
  • 09def2fc add LRUCache for UDPRelay by clowwindy 2015-07-11 18:32:32 +0800
  • 680d4653 add UDPRelay by clowwindy 2015-07-11 17:15:04 +0800
  • f5500c40 support UDP assoc in UDP relay by clowwindy 2015-07-11 15:41:47 +0800
  • ef357bbb handshake before connecting to server by clowwindy 2015-07-11 13:19:16 +0800
  • 39d14eec (refs/pull/224/merge) Merge bfd412c3ae into 96f996c6de by LittleFoolfish 2015-06-28 07:00:03 +0000
  • 96f996c6 Update README.md by clowwindy 2015-06-28 14:15:49 +0800
  • bfd412c3 (refs/pull/224/head) add clear log by LittleFoolfish 2015-06-18 14:38:04 +0800
  • 63b81cdb (refs/pull/223/merge) Merge ec49f42844 into 967c4e8c8b by Yilun Zhu 2015-06-07 08:29:43 +0000
  • ec49f428 (refs/pull/223/head) 规范多语言特性命名 by celeron533 2015-06-07 15:58:00 +0800
  • 190e9c63 (refs/pull/222/merge) Merge 08c6b18269 into 967c4e8c8b by TsungKang 2015-06-05 03:36:11 +0000
  • 08c6b182 make PingForm Thread Background by TsungKang 2015-06-05 11:21:19 +0800
  • e0f60699 add PingForm by TsungKang 2015-06-05 11:14:50 +0800
  • 7c78be3c (refs/pull/221/merge) Merge 9a28cd538d into 967c4e8c8b by xuchi 2015-05-14 03:31:23 +0000
  • 9a28cd53 (refs/pull/221/head) Add SocketAsyncEventArgs to handle local connections by xuchi 2015-05-14 11:28:06 +0800
  • 08c032cb (refs/pull/220/merge) Merge d344376388 into 967c4e8c8b by 罗光盛 2015-05-11 16:53:46 +0000
  • d3443763 (refs/pull/220/head) Merge branch 'release/r1' by everyx 2015-05-12 00:44:06 +0800
  • 4f511510 Merge branch 'feature/gfwlist2pac' into develop by everyx 2015-05-12 00:41:43 +0800
  • 0c23e25e Add missing file for feature gfwlist2pac by everyx 2015-05-12 00:41:29 +0800
  • 0c9d5606 Add feature, something like gfwlist2pac by everyx 2015-05-12 00:38:42 +0800
  • 5904a251 (refs/pull/218/merge) Merge de6608f9ef into 967c4e8c8b by wenhx 2015-04-29 04:59:24 +0000
  • 967c4e8c Update CONTRIBUTING.md by clowwindy 2015-04-29 11:42:57 +0800
  • 5182dcdc Update CONTRIBUTING.md by clowwindy 2015-04-29 11:40:05 +0800
  • 660857a3 Update CONTRIBUTING.md by clowwindy 2015-04-29 11:39:34 +0800
  • de6608f9 (refs/pull/218/head) Update README.md by wenhx 2015-04-25 23:43:45 +0800
  • 8c410d32 (refs/pull/216/merge) Merge 2c480b73bb into 5c172a3e49 by lennylxx 2015-04-24 06:33:07 +0000
  • 2c480b73 (refs/pull/216/head) Open update checker link with default browser. by lennylxx 2015-04-24 14:32:06 +0800
  • 58c7fb49 Fix the bug that opening url using default browser. by lennylxx 2015-04-23 22:49:07 +0800
  • c51b122f (refs/pull/187/merge) Merge e3c69f8fff into 5c172a3e49 by EraserKing 2015-04-06 14:50:02 +0000
  • 5c172a3e Update README.md by clowwindy 2015-04-04 12:33:23 +0800
  • dd0ac006 Update README.md by clowwindy 2015-04-04 12:25:05 +0800
  • 95242208 UX fix by clowwindy 2015-03-22 20:23:40 +0800
  • 0d4dc2ad Merge pull request #197 from GangZhuo/online-pac by clowwindy 2015-03-21 19:23:38 +0800
  • 532a53c9 (refs/pull/197/head) revert by Gang Zhuo 2015-03-21 19:07:58 +0800
  • c6e6d019 fix regular expression by Gang Zhuo 2015-03-21 19:02:17 +0800
  • 00f57ee3 validate user input by Gang Zhuo 2015-03-21 18:47:05 +0800
  • 80dc5c0e remove not use message by Gang Zhuo 2015-03-20 21:51:07 +0800
  • 5f2ec3cc Use VB.NET InputBox instead of implement a message box by Gang Zhuo 2015-03-20 21:26:31 +0800
  • b762c804 Direct set the system PAC to the online PAC URL by Gang Zhuo 2015-03-20 21:14:27 +0800
  • 1f03350c (refs/pull/198/merge) Merge 72eb35b0ab into 9a4f724653 by Gang Zhuo 2015-03-20 08:29:34 +0000
  • 72eb35b0 (refs/pull/198/head) support online pac, see https://github.com/shadowsocks/shadowsocks-csharp/issues/163 by Gang Zhuo 2015-03-20 04:12:53 -0400
  • 1bb01bb6 rename CancelButton to MyCancelButton by Gang Zhuo 2015-03-20 01:37:05 -0400
  • 4d4d0260 layout by TableLayoutPanel by Gang Zhuo 2015-03-20 01:08:01 -0400
  • f946b0d9 fix I18N by Gang Zhuo 2015-03-20 01:07:10 -0400
  • e0612854 support online pac, see https://github.com/shadowsocks/shadowsocks-csharp/issues/163 by Gang Zhuo 2015-03-20 00:39:31 -0400
  • 2ff953cc (refs/pull/191/head) e.... by Cologler 2015-03-13 09:31:02 +0800
  • e3c69f8f (refs/pull/187/head) Add command line support to specify folder for ss_polipo by Victor Jiang 2015-03-10 10:00:36 +0800
  • 21fe6fa6 Change ss_polipo.exe and polipo.conf to current working directory to prevent blocking to temp folder by group policy. by Victor Jiang 2015-03-09 11:07:07 +0800
  • 9a4f7246 (tag: 2.3.1) bump 2.3.1 by clowwindy 2015-03-06 23:21:56 +0800
  • fcb0adfc add comments in cn.txt by clowwindy 2015-03-06 23:18:23 +0800
  • eb2e5cc2 add GUI for user rule support by clowwindy 2015-03-06 23:02:07 +0800
  • 3e169789 Merge branch 'minoscc-master' by clowwindy 2015-03-04 18:33:41 +0800
  • 28887b98 自定义规则使用user-rule.txt保存 by Siuzuk Zan 2015-03-04 18:11:50 +0800
  • 7fa3f6a6 (refs/pull/181/merge) Merge a821631f2f into d4d3e804cb by Siuzuk Zan 2015-03-04 10:18:35 +0000
  • a821631f (refs/pull/181/head) 自定义规则使用user-rule.txt保存 by Siuzuk Zan 2015-03-04 18:11:50 +0800
  • d4d3e804 Merge pull request #174 from wenxiao/master by clowwindy 2015-02-17 23:35:08 +0900