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