Merge branch '0.4.x' into 0.5.0.x

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/key.h
Simple merge

diff --cc src/main.cpp
index e94c872,652d4c1..7478054
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -2224,8 -2223,12 +2264,13 @@@ bool static ProcessMessage(CNode* pfrom
          {
              printf("storing orphan tx %s\n", inv.hash.ToString().substr(0,10).c_str());
              AddOrphanTx(vMsg);
+ 
+             // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
+             int nEvicted = LimitOrphanTxSize(MAX_ORPHAN_TRANSACTIONS);
+             if (nEvicted > 0)
+                 printf("mapOrphan overflow, removed %d tx\n", nEvicted);
          }
 +        if (tx.nDoS) pfrom->Misbehaving(tx.nDoS);
      }
  
  

diff --cc src/main.h
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/wallet.cpp
Simple merge