Merge pull request #1925 from OpenBazaar/brian.masterTransports

(#1861, 1862) Update vendored transports for Master

Author: placer14

core/images.go

@@ -9,7 +9,6 @@ import (
 	_ "image/png"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	netUrl "net/url"
 	"os"
@@ -164,10 +163,9 @@ func (n *OpenBazaarNode) FetchImage(peerID string, imageType string, size string
 
 // GetBase64Image - fetch the image and return it as base64 encoded string
 func (n *OpenBazaarNode) GetBase64Image(url string) (base64ImageData, filename string, err error) {
-	dial := net.Dial
 	var client *http.Client
 	if n.TorDialer != nil {
-		dial = n.TorDialer.Dial
+		dial := n.TorDialer.Dial
 		tbTransport := &http.Transport{Dial: dial}
 		client = &http.Client{Transport: tbTransport, Timeout: time.Second * 30}
 	} else {

net/retriever/retriever.go

@@ -13,7 +13,6 @@ import (
 	"gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 
 	"io/ioutil"
-	gonet "net"
 	"net/http"
 	"sync"
 	"time"
@@ -68,10 +67,9 @@ type offlineMessage struct {
 }
 
 func NewMessageRetriever(cfg MRConfig) *MessageRetriever {
-	dial := gonet.Dial
 	var client *http.Client
 	if cfg.Dialer != nil {
-		dial = cfg.Dialer.Dial
+		dial := cfg.Dialer.Dial
 		tbTransport := &http.Transport{Dial: dial}
 		client = &http.Client{Transport: tbTransport, Timeout: time.Second * 30}
 	} else {