Merge branch 'addrman' of https://github.com/sipa/bitcoin

diff --cc bitcoin-qt.pro
Simple merge

diff --cc src/db.cpp
Simple merge

diff --cc src/db.h
Simple merge

diff --cc src/init.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/makefile.unix
Simple merge

diff --cc src/net.cpp
index 94ef7e7,08edafb..e9ec233
--- 1/src/net.cpp
--- 2/src/net.cpp
+++ b/src/net.cpp
@@@ -1820,8 -1728,12 +1737,12 @@@ void StartNode(void* parg
      if (!CreateThread(ThreadMessageHandler, NULL))
          printf("Error: CreateThread(ThreadMessageHandler) failed\n");
  
+     // Dump network addresses
+     if (!CreateThread(ThreadDumpAddress, NULL))
+         printf("Error; CreateThread(ThreadDumpAddress) failed\n");
+ 
      // Generate coins in the background
 -    GenerateBitcoins(fGenerateBitcoins, pwalletMain);
 +    GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain);
  }
  
  bool StopNode()

diff --cc src/net.h
index d3e10f5,6fd4944..b44cc5d
--- 1/src/net.h
--- 2/src/net.h
+++ b/src/net.h
@@@ -14,9 -14,9 +14,10 @@@
  #include <arpa/inet.h>
  #endif
  
 +#include "mruset.h"
  #include "netbase.h"
  #include "protocol.h"
+ #include "addrman.h"
  
  class CAddrDB;
  class CRequestTracker;