Merge 68d1f1698f into merged_master (Bitcoin PR #19890)

This commit is contained in:
Andrew Poelstra 2020-11-28 23:47:58 +00:00
commit eec76f80cc

View file

@ -8,10 +8,6 @@
#include <util/strencodings.h>
#include <util/system.h>
#ifndef WIN32
# include <arpa/inet.h>
#endif
static std::atomic<bool> g_initial_block_download_completed(false);
namespace NetMsgType {