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