aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2011-12-19 16:05:15 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2011-12-19 16:05:15 -0500
commitf503a1486a6cbda8d0e73923fec8de3ced253b28 (patch)
tree6d309123480ab521dd032eedbeb946ec5fe80001 /src/net.cpp
parent5fe2dbd7b6a182b90128371f8e8d679d70133d6b (diff)
parent987f26aa1aeb2b3c546ada41ae4eab6bdee7099c (diff)
downloadbitcoin-f503a1486a6cbda8d0e73923fec8de3ced253b28.tar.xz
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp
index e0ac2abef0..50d28913e0 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -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)