Merge 2074d7df20 into merged_master (Bitcoin PR bitcoin/bitcoin#24837)

This commit is contained in:
James Dorfman 2024-08-01 00:59:25 +00:00
commit 9589e4d604

View file

@ -716,7 +716,8 @@ void InitParameterInteraction(ArgsManager& args)
LogPrintf("%s: parameter interaction: -connect set -> setting -listen=0\n", __func__);
}
if (args.IsArgSet("-proxy")) {
std::string proxy_arg = args.GetArg("-proxy", "");
if (proxy_arg != "" && proxy_arg != "0") {
// to protect privacy, do not listen by default if a default proxy server is specified
if (args.SoftSetBoolArg("-listen", false))
LogPrintf("%s: parameter interaction: -proxy set -> setting -listen=0\n", __func__);