Merge commit 'a2d5783' into bfgminer

Conflicts:
	util.c

miner.h

@@ -972,7 +972,6 @@ struct pool {
 	CURL *stratum_curl;
 	SOCKETTYPE sock;
 	char sockbuf[RBUFSIZE];
-	struct sockaddr_in *server, client;
 	char *sockaddr_url; /* stripped url used for sockaddr */
 	char *nonce1;
 	uint32_t nonce2;

util.c

@@ -860,15 +860,6 @@ bool extract_sockaddr(struct pool *pool, char *url)
 		applog(LOG_DEBUG, "Failed to extract sock addr");
 		return false;
 	}
-
-	free(pool->server);
-	pool->server = malloc(res->ai_addrlen);
-	if (!pool->server) {
-		freeaddrinfo(res);
-		applog(LOG_ERR, "Malloc failure in extract_sockaddr");
-		return false;
-	}
-	memcpy(pool->server, res->ai_addr, res->ai_addrlen);
 	freeaddrinfo(res);
 
 	free(pool->sockaddr_url);