Merge remote-tracking branch 'upstream/master'

This commit is contained in:
kimw
2015-09-12 00:07:46 +08:00
2 changed files with 25 additions and 2 deletions
@@ -6,8 +6,8 @@ using System.Net.NetworkInformation;
using System.Threading;
using Shadowsocks.Model;
using System.Reflection;
using Shadowsocks.Util;
using Shadowsocks.Util;
namespace Shadowsocks.Controller
{
class AvailabilityStatistics
@@ -81,6 +81,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine($"An exception occured when eveluating {server.FriendlyName()}");
Logging.LogUsefulException(e);
}
}