Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/main.cpp

diff --cc src/main.cpp
index 0599b25,5f98d49..e78dc49
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1669,22 -1502,8 +1669,12 @@@ bool CBlock::CheckBlock() cons
      if (uniqueTx.size() != vtx.size())
          return DoS(100, error("CheckBlock() : duplicate transaction"));
  
-     // Check for duplicate txids. This is caught by ConnectInputs(),
-     // but catching it earlier avoids a potential DoS attack:
-     set<uint256> uniqueTx;
-     BOOST_FOREACH(const CTransaction& tx, vtx)
-     {
-         uniqueTx.insert(tx.GetHash());
-     }
-     if (uniqueTx.size() != vtx.size())
-         return error("CheckBlock() : duplicate transaction");
- 
 -    // Check that it's not full of nonstandard transactions
 -    if (GetSigOpCount() > MAX_BLOCK_SIGOPS)
 +    int nSigOps = 0;
 +    BOOST_FOREACH(const CTransaction& tx, vtx)
 +    {
 +        nSigOps += tx.GetLegacySigOpCount();
 +    }
 +    if (nSigOps > MAX_BLOCK_SIGOPS)
          return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"));
  
      // Check merkleroot