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