From a6bd3a7e53d6c753afc7499aebc168db548e83ee Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Thu, 28 May 2020 23:53:19 +0000
Subject: [PATCH] logpolicy: use netns for dialing log.tailscale.io.

---
 logpolicy/logpolicy.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/logpolicy/logpolicy.go b/logpolicy/logpolicy.go
index eeccf1494..0b5b4922c 100644
--- a/logpolicy/logpolicy.go
+++ b/logpolicy/logpolicy.go
@@ -29,6 +29,7 @@ import (
 	"tailscale.com/atomicfile"
 	"tailscale.com/logtail"
 	"tailscale.com/logtail/filch"
+	"tailscale.com/net/netns"
 	"tailscale.com/net/tlsdial"
 	"tailscale.com/version"
 )
@@ -249,11 +250,10 @@ func newLogtailTransport(host string) *http.Transport {
 
 	// Log whenever we dial:
 	tr.DialContext = func(ctx context.Context, netw, addr string) (net.Conn, error) {
-		nd := &net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-			DualStack: true,
-		}
+		nd := netns.Dialer()
+		nd.Timeout = 30 * time.Second
+		nd.KeepAlive = 30 * time.Second
+		nd.DualStack = true
 		t0 := time.Now()
 		c, err := nd.DialContext(ctx, netw, addr)
 		d := time.Since(t0).Round(time.Millisecond)