diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-07 10:58:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-07 12:45:28 +0200 |
| commit | 4252f2928b26e1ad37bc899e6602393c1053ec4e (patch) | |
| tree | f0dedbd4cb1e253016e8c0a6051e06162fd19b28 /src/rpcnet.cpp | |
| parent | 0aa1d106e897865b84b64fba087e9a94e37f92d2 (diff) | |
| parent | a339a37b28176135c7fe5adbd3b50da77a45373d (diff) | |
| download | bitcoin-4252f2928b26e1ad37bc899e6602393c1053ec4e.tar.xz | |
Merge pull request #4327
a339a37 error out, when we detect -socks argument (Philip Kaufmann)
0127a9b remove SOCKS4 support from core and GUI (Philip Kaufmann)
Diffstat (limited to 'src/rpcnet.cpp')
| -rw-r--r-- | src/rpcnet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index cd3bd59f8f..cf2c293caf 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -371,7 +371,7 @@ Value getnetworkinfo(const Array& params, bool fHelp) obj.push_back(Pair("localservices", strprintf("%016x", nLocalServices))); obj.push_back(Pair("timeoffset", GetTimeOffset())); obj.push_back(Pair("connections", (int)vNodes.size())); - obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); + obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.ToStringIPPort() : string()))); obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); Array localAddresses; { |