4 Commits
Author SHA1 Message Date
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
Kaguya 87c5b23e21 https://github.com/shadowsocks/shadowsocks-windows/issues/399 2015-12-15 14:27:27 +08:00
clowwindy aa8e6558d5 move polarssl context to unmanaged heap; fix #32 2014-11-12 01:51:11 +08:00
clowwindy e0780c0ff8 version check 2014-11-09 17:35:44 +08:00