merge: resolve conflicts with main branch

2026-10-06 01:56:37 +08:00 · 2026-03-03 14:19:18 +08:00
parent 1c10347357 5bd21e2ac1
commit be9d8773ce
50 changed files with 41353 additions and 1 deletions
@@ -97,7 +97,6 @@ func TestBuildForwardServiceConfigs_DefaultListenAddrWhenBindIPEmpty(t *testing.
 		t.Fatalf("expected udp addr [::]:22001, got %q", udpAddr)
 	}
 }
-
 func TestBuildForwardServiceConfigs_BindIPAlreadyContainsPort(t *testing.T) {
 	forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
 	node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}