Merge pull request #3514

f59d8f0 Per-peer block download tracking and stalled download detection. (Pieter Wuille)

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
Simple merge

diff --cc src/net.h
index 8a7531d61b93f2e9822bb35c4cbecd24a38cc315,0307a0ccb299364f1609041c5dfebb1d11679756..6210ed80c18585941b45880ad7efe68ebd1fefb9
--- 1/src/net.h
--- 2/src/net.h
+++ b/src/net.h
@@@ -423,10 -424,10 +423,10 @@@ public
              nRequestTime = it->second;
          else
              nRequestTime = 0;
 -        LogPrint("net", "askfor %s   %"PRId64" (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
 +        LogPrint("net", "askfor %s   %d (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
  
          // Make sure not to reuse time indexes to keep things in the same order
-         int64_t nNow = (GetTime() - 1) * 1000000;
+         int64_t nNow = GetTimeMicros() - 1000000;
          static int64_t nLastTime;
          ++nLastTime;
          nNow = std::max(nNow, nLastTime);