This was meant to be part of 53a2f6365801c44d4a34797c0d38af26fb5f9296 earlier but I guess I failed at git. Updates #2436 Updates tailscale/corp#2250 Updates tailscale/corp#2238 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>