Updates #4872 Change-Id: I43db63d2ba237324bc1cd87d4261197f14cb1088 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>