Merge branch 'dev'

jack80342 · Feb 9, 2022 · 83cfcf8 · 83cfcf8
2 parents 78c0809 + ffe6eb7
commit 83cfcf8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ShadowsocksX-NG-R
+# ShadowsocksX-NG
 
 [![Build Status](https://travis-ci.org/shadowsocksr/ShadowsocksX-NG.svg?branches=develop)](https://travis-ci.org/shadowsocksr/ShadowsocksX-NG)
 

diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj
@@ -868,7 +868,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.11;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -901,7 +901,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.11;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/ShadowsocksX-NG/ProxyConfHelper.swift b/ShadowsocksX-NG/ProxyConfHelper.swift
@@ -37,7 +37,7 @@ class ProxyConfHelper {
 
         var str: String?
         if let data = data {
-            str = String(data: data, encoding: .utf8)
+            str = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .newlines)
         }
 
         if str != kProxyConfHelperVersion {