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

..

AvailabilityStatistics.cs

Merge upstream

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

GfwListUpdater.cs

Merge upstream

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

Listener.cs

fixed: standardize Logging usage

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

PACServer.cs

Merge upstream

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

PolipoRunner.cs

fixed: standardize Logging usage

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

PortForwarder.cs

Merge upstream

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

TCPRelay.cs

Merge upstream

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

UDPRelay.cs

Add debug log in network transfer.

2015-11-16 14:59:10 +08:00

UpdateChecker.cs

delay check for updates

2015-12-16 23:19:07 +08:00