5bf65c580d
And remove old SHORT, LONG deprecated variables. Fixes tailscale/corp#1905 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>