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