diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-12 18:12:33 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-12 18:35:45 +0100 |
| commit | 0c7862e968ade4e5c07bc5b9e7a57e05fcb37d24 (patch) | |
| tree | a685ca155014b885f01765f27448752a3cd2219b /src/init.cpp | |
| parent | 7ffb880775dea72e517d19c27eed871f26f8d817 (diff) | |
| parent | 845c86d128fb97d55d125e63653def38729bd2ed (diff) | |
| download | bitcoin-0c7862e968ade4e5c07bc5b9e7a57e05fcb37d24.tar.xz | |
Merge pull request #5161
845c86d Do not use third party services for IP detection. (Gregory Maxwell)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 22ec80e17b..b290d54158 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -574,6 +574,9 @@ bool AppInit2(boost::thread_group& threadGroup) // to protect privacy, do not listen by default if a default proxy server is specified if (SoftSetBoolArg("-listen", false)) LogPrintf("AppInit2 : parameter interaction: -proxy set -> setting -listen=0\n"); + // to protect privacy, do not discover addresses by default + if (SoftSetBoolArg("-discover", false)) + LogPrintf("AppInit2 : parameter interaction: -proxy set -> setting -discover=0\n"); } if (!GetBoolArg("-listen", true)) { |