Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Dec 2011 21:05:15 +0000 (16:05 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Dec 2011 21:05:15 +0000 (16:05 -0500)
src/net.cpp

index e0ac2ab..50d2891 100644 (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)