Merge 62d9ff9e6e into merged_master (Bitcoin PR bitcoin/bitcoin#22107)

This commit is contained in:
Andrew Poelstra 2021-07-19 23:51:25 +00:00
commit 62962e335d
6 changed files with 10 additions and 10 deletions

View file

@ -418,7 +418,7 @@ private:
if (conn_type == "addr-fetch") return "addr";
return "";
}
const int64_t m_time_now{GetSystemTimeInSeconds()};
const int64_t m_time_now{GetTimeSeconds()};
public:
static constexpr int ID_PEERINFO = 0;