Merge remote-tracking branch 'upstream/dev-next' into dev-next

constant/proxy.go

@@ -30,7 +30,8 @@ const (
 	TypeSSMAPI       = "ssm-api"
 	TypeCCM          = "ccm"
 	TypeOCM          = "ocm"
-	TypeMySQL        = "mysql"
+	TypeOOMKiller    = "oom-killer"
+	TypeMySQL		 = "mysql"
 )
 
 const (
@@ -86,6 +87,8 @@ func ProxyDisplayName(proxyType string) string {
 		return "Hysteria2"
 	case TypeAnyTLS:
 		return "AnyTLS"
+	case TypeTailscale:
+		return "Tailscale"
 	case TypeMySQL:
 		return "MySQL"
 	case TypeSelector: