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

..

Properties

bump

2015-01-02 00:20:19 +08:00

packages.config

Merge upstream

2016-01-04 09:14:55 +08:00

test.csproj

Merge upstream

2016-01-04 09:14:55 +08:00

UnitTest.cs

override MD5, so compatible with FIPS

2015-11-23 23:52:54 +08:00