Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
645 Commits 7 Branches 37 Tags
bc3080701bea65a0b88aba8f5abb4e4f41ab5a67
Commit Graph
645 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kimw bc3080701b daily rolling log file 2016-01-10 09:44:00 +08:00
kimw 937171996a name the variable better: rename LogFile => LogFilePath 2016-01-10 05:22:20 +08:00
kimw af3fe3fc92 upgraded 3rd packages: 
Fody 1.29.3 => 1.29.4
Microsoft.Bcl 1.1.8 => 1.1.10
Microsoft.Bcl.Build 1.0.14 => 1.0.21
Newtonsoft.Json 7.0.1 => 8.0.2
 2016-01-10 04:37:56 +08:00
Gang Zhuo 12ba488c7b atomic operations to increase traffic statistics 2016-01-05 21:42:57 -05:00
Gang Zhuo b918cb85ae tiny fix 2016-01-05 01:54:42 -05:00
Gang Zhuo d2833e6d9f Merge pull request #413 from kimw/master 
a lot of commits
 2016-01-05 14:49:48 +08:00
kimw 6f38bbb1d3 fixed 0 bytes will not show up, and, corrected function name 2016-01-05 04:49:17 +08:00
kimw 22accf4a90 reformated source code 2016-01-05 03:49:57 +08:00
kimw d2bb2c4a7d fixed don't update abp rules while event user-rule file changed. in fact, the PAC will overwrite with gfwlist & use-rule but abp. 2016-01-05 03:48:55 +08:00
kimw c2095b5ad7 migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files. 2016-01-05 03:45:26 +08:00
kimw 04486094f7 fixed compile errors in Release mode 2016-01-05 03:26:55 +08:00
kimw 84f14d71c9 clean up avoid log message on timeout and network cut off. it's useless but confuse users. 2016-01-05 00:01:06 +08:00
kimw b813d9eebc featured middle click on tray pops up log viewer 2016-01-04 23:58:24 +08:00
kimw 9194b0325f avoid warning message while compile 2016-01-04 23:57:30 +08:00
kimw 64390d45ac GetTempPath() now supports: return a full path with filename combined which pointed to the temporary directory 2016-01-04 23:56:43 +08:00
kimw 2cce646700 featured show bandwidth in log form's title 2016-01-04 23:21:53 +08:00
kimw 0b16ef7445 Merge upstream 
# Conflicts:
#	README.md
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Service/PACServer.cs
#	shadowsocks-csharp/Controller/Strategy/SimplyChooseByStatisticsStrategy.cs
#	shadowsocks-csharp/Data/cn.txt
#	shadowsocks-csharp/Model/Configuration.cs
#	shadowsocks-csharp/Model/LogViewerConfig.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/LogForm.cs
#	shadowsocks-csharp/View/MenuViewController.cs
 2016-01-04 09:14:55 +08:00
Gang Zhuo e76582c602 Merge pull request #405 from wongsyrone/chacha20-ietf 
add chacha20-ietf support with updated libsscrypto
 2015-12-17 18:43:39 +08:00
Syrone Wong 131c4940c6 add chacha20-ietf support with updated libsscrypto 
ChaCha20 with an extended (96 bit) nonce and a 32-bit counter has
been implemented as crypto_stream_chacha20_ietf() from LibSodium 1.0.4

Please refer to https://tools.ietf.org/html/rfc7539 for details.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2015-12-17 18:25:13 +08:00
Gang Zhuo c539e027d7 support custom abp file 2015-12-16 23:35:53 +08:00
Gang Zhuo 3d49bc3128 delay check for updates 2015-12-16 23:19:07 +08:00
Gang Zhuo 805226024b Merge pull request #400 from SuperHentai/master 
Fix https://github.com/shadowsocks/shadowsocks-windows/issues/399
 2015-12-15 17:27:35 +08:00
Kaguya 87c5b23e21 https://github.com/shadowsocks/shadowsocks-windows/issues/399 2015-12-15 14:27:27 +08:00
icylogic 0ffee0110a Merge pull request #391 from icylogic/master 
Fix #389
 2015-12-13 23:49:53 +08:00
icylogic e900ad30d7 Merge branch 'hotfix/check_usability' 2015-12-08 22:53:51 +08:00
icylogic 1196696ed7 fix #389: crash on empty statistic data. 2015-12-08 22:53:29 +08:00
Gang Zhuo 961ca041b2 Fix bug 2015-11-25 21:26:45 -05:00
Gang Zhuo dd0d047402 override MD5, so compatible with FIPS 2015-11-23 23:52:54 +08:00
Gang Zhuo 1097d4fc5b remove space by trim() 2015-11-20 22:49:42 +08:00
Gang Zhuo 6838c9d605 Merge pull request #376 from 10people/master 
Fix error in open log file in debug mode.
 2015-11-19 20:15:24 +08:00
10people d0e16dc658 Add debug log in network transfer. 2015-11-16 14:59:10 +08:00
10people ca44b52593 Fix error in open log file in debug mode. 2015-11-16 14:48:26 +08:00
Gang Zhuo 8067a5bcec Merge pull request #372 from ayanamist/ayanamist-patch-1 
Update privoxy_conf.txt
 2015-11-12 18:50:00 +08:00
ayanamist ad75e4fd9c Update privoxy_conf.txt 
use __POLIPO_BIND_PORT__ to avoid potential port conflict
 2015-11-12 13:46:10 +08:00
Gang Zhuo d24548a04f rm rc4 and table 2015-10-16 04:36:31 -04:00
icylogic 82b661e6a5 Merge pull request #345 from everyx/fix-ArgumentOutOfRangeException 
fix ArgumentOutOfRangeException
 2015-10-11 11:56:35 +08:00
everyx 1e9f1f3764 fix ArgumentOutOfRangeException 2015-10-11 00:21:25 +08:00
Gang Zhuo 8a6249c4a3 revert Newtonsoft.Json 2015-10-10 03:34:27 -04:00
Gang Zhuo c532cce99d small fix 2015-10-08 06:40:33 -04:00
Gang Zhuo 092d1168ff start all instances on boot under portable model 2015-10-08 06:33:02 -04:00
Gang Zhuo 8bc9a7911b remove reference of Newtonsoft.Json 2015-10-08 05:57:14 -04:00
Gang Zhuo 29d70acfb5 replace 'one_time_auth' to 'auth' 2015-10-07 23:43:41 -04:00
icylogic ad8a8c24e6 Merge pull request #340 from icylogic/feature/statistics_ui 
Feature/statistics ui
 2015-10-01 00:21:44 +08:00
icylogic 6550c04650 escape comma for csv; 
prevent a bug
 2015-10-01 00:16:53 +08:00
icylogic 426623c9f2 always notify user that a choice is made 2015-10-01 00:02:38 +08:00
icylogic dcc751773c tiny fix 2015-09-30 23:59:03 +08:00
icylogic b9632f8636 basic statistics form UI 2015-09-30 23:54:36 +08:00
icylogic 4684af053e Merge branch 'master' into feature/statistics_ui 2015-09-30 21:16:45 +08:00
Gang Zhuo 5c570fbb56 disable one-time auth when method is table or rc4 2015-09-25 21:18:15 +08:00
Gang Zhuo 098640e792 refact 2015-09-25 04:42:56 -04:00