Merge 6e21dedbf2 into merged_master (Bitcoin PR bitcoin/bitcoin#31130)

This commit is contained in:
Tom Trevethan 2026-04-01 13:36:19 +01:00
commit 1244d0d5a3
40 changed files with 44 additions and 428 deletions

View file

@ -187,7 +187,7 @@ public:
});
args().WriteSettingsFile();
}
void mapPort(bool use_upnp, bool use_pcp) override { StartMapPort(use_upnp, use_pcp); }
void mapPort(bool use_pcp) override { StartMapPort(use_pcp); }
bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
size_t getNodeCount(ConnectionDirection flags) override
{