Chore: Merge branch 'ogn-dev' into with-tun

2022-03-16 20:16:30 +08:00
parent 3a9bbf6c73 fb7d340233
commit 346d817dba
74 changed files with 675 additions and 281 deletions
--- a/component/dialer/bind_others.go
+++ b/component/dialer/bind_others.go
@ -1,5 +1,4 @@
 //go:build !linux && !darwin
-// +build !linux,!darwin

 package dialer

--- a/component/dialer/mark_linux.go
+++ b/component/dialer/mark_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package dialer

--- a/component/dialer/mark_nonlinux.go
+++ b/component/dialer/mark_nonlinux.go
@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package dialer

--- a/component/dialer/reuse_others.go
+++ b/component/dialer/reuse_others.go
@ -1,5 +1,4 @@
 //go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows

 package dialer

--- a/component/dialer/reuse_unix.go
+++ b/component/dialer/reuse_unix.go
@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris

 package dialer