aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmisc.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-04-20 16:35:11 +0200
committerWladimir J. van der Laan <[email protected]>2015-04-20 16:37:38 +0200
commitb6ea3bcede1cbbf89486b9d67329e0110c4624ae (patch)
treefabff7884ea479e390b893e5aa2bbe9fbbde87c9 /src/rpcmisc.cpp
parentMerge pull request #6029 (diff)
parentrpc-tests: Add proxy test (diff)
downloaddiscoin-b6ea3bcede1cbbf89486b9d67329e0110c4624ae.tar.xz
discoin-b6ea3bcede1cbbf89486b9d67329e0110c4624ae.zip
Merge pull request #5911
6be3562 rpc-tests: Add proxy test (Wladimir J. van der Laan) 67a7949 privacy: Stream isolation for Tor (Wladimir J. van der Laan)
Diffstat (limited to 'src/rpcmisc.cpp')
-rw-r--r--src/rpcmisc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 938d79513..f5bef2a07 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -90,7 +90,7 @@ Value getinfo(const Array& params, bool fHelp)
obj.push_back(Pair("blocks", (int)chainActive.Height()));
obj.push_back(Pair("timeoffset", GetTimeOffset()));
obj.push_back(Pair("connections", (int)vNodes.size()));
- obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.ToStringIPPort() : string())));
+ obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC()));
#ifdef ENABLE_WALLET