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
This commit is contained in:
kimw
2016-01-04 09:14:55 +08:00
20 changed files with 293 additions and 88 deletions
+2 -1
View File
@@ -72,7 +72,7 @@ namespace Shadowsocks.Model
{
if (!(e is FileNotFoundException))
{
Console.WriteLine(e);
Logging.LogUsefulException(e);
}
return new Configuration
{
@@ -167,6 +167,7 @@ namespace Shadowsocks.Model
}
}
// internal class
private class JsonSerializerStrategy : SimpleJson.PocoJsonSerializerStrategy
{
// convert string to int