From 5aafe0ee96d214353b0b48ac37624616bae35772 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Sun, 15 Mar 2020 22:27:36 -0700
Subject: [PATCH] cmd/tailscale: don't crash on too many non-flag args

---
 cmd/tailscale/tailscale.go | 3 +--
 version/version.go         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cmd/tailscale/tailscale.go b/cmd/tailscale/tailscale.go
index 57db63be8..a7a8fef98 100644
--- a/cmd/tailscale/tailscale.go
+++ b/cmd/tailscale/tailscale.go
@@ -18,7 +18,6 @@ import (
 	"syscall"
 
 	"github.com/apenwarr/fixconsole"
-	"github.com/pborman/getopt/v2"
 	"github.com/peterbourgon/ff/v2/ffcli"
 	"github.com/tailscale/wireguard-go/wgcfg"
 	"tailscale.com/ipn"
@@ -120,7 +119,7 @@ var upArgs = struct {
 func runUp(ctx context.Context, args []string) error {
 	pol := logpolicy.New("tailnode.log.tailscale.io")
 	if len(args) > 0 {
-		log.Fatalf("too many non-flag arguments: %#v", getopt.Args()[0])
+		log.Fatalf("too many non-flag arguments: %q", args)
 	}
 
 	defer pol.Close()
diff --git a/version/version.go b/version/version.go
index 3d7537d5e..b35558a7d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -7,5 +7,5 @@
 // Package version provides the version that the binary was built at.
 package version
 
-const LONG = "date.20200311"
+const LONG = "date.20200315"
 const SHORT = LONG // TODO: unused; remove SHORT? Make it a func?