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
parent e76582c602 0a733c61b8
commit 0b16ef7445
20 changed files with 293 additions and 88 deletions
@@ -30,7 +30,7 @@ namespace Shadowsocks.Encryption
            }
            catch (Exception e)
            {
-                Console.WriteLine(e.ToString());
+                Logging.LogUsefulException(e);
            }
            LoadLibrary(dllPath);
        }
@@ -26,7 +26,7 @@ namespace Shadowsocks.Encryption
            }
            catch (Exception e)
            {
-                Console.WriteLine(e.ToString());
+                Logging.LogUsefulException(e);
            }
            LoadLibrary(dllPath);
        }