Merge pull request #2337 from karalabe/upnp-error-hang

p2p/nat: fix #2291, NAT discovery did't abort on failure

p2p/nat/natupnp.go

@@ -139,6 +139,7 @@ func discoverUPnP() Interface {
 func discover(out chan<- *upnp, target string, matcher func(*goupnp.RootDevice, goupnp.ServiceClient) *upnp) {
 	devs, err := goupnp.DiscoverDevices(target)
 	if err != nil {
+		out <- nil
 		return
 	}
 	found := false