icylogic aa2334c9fd Merge branch 'master' into feature/statistics_ui ...

# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/MenuViewController.cs

2015-09-02 00:51:14 +08:00

..

AvailabilityStatistics.cs

Merge branch 'master' into feature/statistics_ui

2015-09-02 00:51:14 +08:00

GfwListUpdater.cs

add load balancing

2015-07-22 15:58:39 +08:00

Listener.cs

same the source code format.

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

PACServer.cs

same the source code format.

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

PolipoRunner.cs

add portable mode

2015-08-19 21:39:06 -07:00

PortForwarder.cs

same the source code format.

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

TCPRelay.cs

Merge remote-tracking branch 'upstream/master'

2015-08-19 18:39:23 +08:00

UDPRelay.cs

same the source code format.

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

UpdateChecker.cs

bump 2.5.6

2015-08-19 22:19:20 -07:00