Merge d960d5ca99 into merged_master (Bitcoin PR #16362)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:08 +00:00
commit 83019c2acd
28 changed files with 264 additions and 200 deletions

View file

@ -25,10 +25,13 @@
#include <util/memory.h>
#include <util/strencodings.h>
#include <util/time.h>
#include <util/translation.h>
#include <util/validation.h>
#include <validation.h>
#include <validationinterface.h>
#include <functional>
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
FastRandomContext g_insecure_rand_ctx;