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

..

Service

Merge upstream

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

Strategy

Merge upstream

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

System

start all instances on boot under portable model

2015-10-08 06:33:02 -04:00

FileManager.cs

fixed: standardize Logging usage

2015-09-14 14:58:46 +08:00

I18N.cs

same the source code format.

2015-08-19 00:24:08 +08:00

Logging.cs

Merge upstream

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

ShadowsocksController.cs

Merge upstream

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