[tor-commits] [meek/master] Client ptInfo can be local to main.

[dcf at torproject.org]

commit 829c658f65eaa3248ab573a25c2119706d6a2acc
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Jan 16 23:33:28 2019 -0700

    Client ptInfo can be local to main.
---
 meek-client/meek-client.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 6059947..f8ec34e 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -81,8 +81,6 @@ const (
 	helperWriteTimeout      = 2 * time.Second
 )
 
-var ptInfo pt.ClientInfo
-
 // We use this RoundTripper to make all our requests when --helper is not
 // in effect. We use the defaults, except we take control of the Proxy setting
 // (notably, disabling the default ProxyFromEnvironment).
@@ -383,7 +381,7 @@ func main() {
 	flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg")
 	flag.Parse()
 
-	ptInfo, err = pt.ClientSetup(nil)
+	ptInfo, err := pt.ClientSetup(nil)
 	if err != nil {
 		log.Fatalf("error in ClientSetup: %s", err)
 	}