Merge tag 'v1.54.1' into sunos-1.54

Release 1.54.1
nshalman · Dec 4, 2023 · 5355f31 · 5355f31
2 parents 978290d + b78b245
commit 5355f31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.54.0
+1.54.1
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
@@ -3970,6 +3970,7 @@ func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ip
 	// properly. This exists as an optimization to control to program fewer DNS
 	// records that have ingress enabled but are not actually being used.
 	hi.WireIngress = b.wantIngressLocked()
+	hi.AppConnector.Set(prefs.AppConnector().Advertise)
 }
 
 // enterState transitions the backend into newState, updating internal