Merge branch '0.4.x' into 0.5.0.x

This commit is contained in:
Luke Dashjr
2011-12-19 16:05:15 -05:00

View File

@@ -1225,6 +1225,8 @@ void MapPort(bool /* unused fMapPort */)
static const char *strDNSSeed[] = {
"bitseed.xf2.org",
"dnsseed.bluematt.me",
"seed.bitcoin.sipa.be",
"dnsseed.bitcoin.dashjr.org",
};
void ThreadDNSAddressSeed(void* parg)