From 3ca1e82f66c74d494af4e6b7cb2845c1174cc15e Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Wed, 18 Sep 2013 00:27:47 -0500
Subject: [PATCH] Make go vet happy.

---
 addrmanager.go | 1 -
 peer.go        | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addrmanager.go b/addrmanager.go
index 17685e04..3a90fa4c 100644
--- a/addrmanager.go
+++ b/addrmanager.go
@@ -557,7 +557,6 @@ func (a *AddrManager) GetAddress(class string, newBias int) *knownAddress {
 			factor *= 1.2
 		}
 	}
-	return nil
 }
 
 func (a *AddrManager) find(addr *btcwire.NetAddress) *knownAddress {
diff --git a/peer.go b/peer.go
index d48328a7..6ad23568 100644
--- a/peer.go
+++ b/peer.go
@@ -1162,7 +1162,11 @@ func newOutboundPeer(s *server, addr string, persistent bool) *peer {
 		dial := net.Dial
 		faddr := addr
 		if cfg.Proxy != "" {
-			proxy := &socks.Proxy{cfg.Proxy, cfg.ProxyUser, cfg.ProxyPass}
+			proxy := &socks.Proxy{
+				Addr:     cfg.Proxy,
+				Username: cfg.ProxyUser,
+				Password: cfg.ProxyPass,
+			}
 			dial = proxy.Dial
 			faddr = fmt.Sprintf("%s via proxy %s", addr, cfg.Proxy)
 		}