From 83b6b06cc40a5b1aec300e1b43a589d7446a5eae Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Tue, 2 Jun 2020 04:27:28 +0000
Subject: [PATCH] cmd/tailscale: fix broken build, result of borked stash pop.

---
 cmd/tailscale/tailscale.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/tailscale/tailscale.go b/cmd/tailscale/tailscale.go
index f72752371..b1201e57f 100644
--- a/cmd/tailscale/tailscale.go
+++ b/cmd/tailscale/tailscale.go
@@ -107,12 +107,12 @@ change in the future.
 var upArgs struct {
 	server          string
 	acceptRoutes    bool
-	noSingleRoutes  bool
+	singleRoutes    bool
 	shieldsUp       bool
 	advertiseRoutes string
 	advertiseTags   string
 	enableDERP      bool
-	noSNAT          bool
+	snat            bool
 	netfilterMode   string
 	authKey         string
 }
@@ -200,11 +200,11 @@ func runUp(ctx context.Context, args []string) error {
 	prefs.ControlURL = upArgs.server
 	prefs.WantRunning = true
 	prefs.RouteAll = upArgs.acceptRoutes
-	prefs.AllowSingleHosts = !upArgs.noSingleRoutes
+	prefs.AllowSingleHosts = !upArgs.singleRoutes
 	prefs.ShieldsUp = upArgs.shieldsUp
 	prefs.AdvertiseRoutes = routes
 	prefs.AdvertiseTags = tags
-	prefs.NoSNAT = upArgs.noSNAT
+	prefs.NoSNAT = upArgs.snat
 	prefs.DisableDERP = !upArgs.enableDERP
 	if runtime.GOOS == "linux" {
 		switch upArgs.netfilterMode {