From de875a4d872f0e86c641c536a09791e842515e69 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Wed, 8 Jul 2020 15:50:41 -0700
Subject: [PATCH] wgengine/magicsock: remove DisableSTUNForTesting

---
 wgengine/magicsock/magicsock.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index 0adeaaf55..83df340a9 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -210,8 +210,6 @@ type activeDerp struct {
 // The current default (zero) means to auto-select a random free port.
 const DefaultPort = 0
 
-var DisableSTUNForTesting bool
-
 // Options contains options for Listen.
 type Options struct {
 	// Logf optionally provides a log function to use.
@@ -367,7 +365,7 @@ func (c *Conn) updateNetInfo(ctx context.Context) (*netcheck.Report, error) {
 	dm := c.derpMap
 	c.mu.Unlock()
 
-	if DisableSTUNForTesting || dm == nil {
+	if dm == nil {
 		return new(netcheck.Report), nil
 	}