mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 6e21dedbf2 into merged_master (Bitcoin PR bitcoin/bitcoin#31130)
This commit is contained in:
commit
1244d0d5a3
40 changed files with 44 additions and 428 deletions
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue