Merge branch 'signbugs' of https://github.com/wizeman/bitcoin

Resolved minor conflict in main.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index be2733192e..0654ff8897 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2475,7 +2475,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
                     static uint256 hashSalt;
                     if (hashSalt == 0)
                         hashSalt = GetRandHash();
-                    int64 hashAddr = addr.GetHash();
+                    uint64 hashAddr = addr.GetHash();
                     uint256 hashRand = hashSalt ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/(24*60*60));
                     hashRand = Hash(BEGIN(hashRand), END(hashRand));
                     multimap<uint256, CNode*> mapMix;