Merge branch 'master' of https://github.com/bitcoin/bitcoin

[novacoin.git] / src / init.cpp

diff --git a/src/init.cpp b/src/init.cpp
index c328ca3..eeb22bb 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -246,7 +246,8 @@ bool AppInit2(int argc, char* argv[])
     fPrintToDebugger = GetBoolArg("-printtodebugger");
 
     fTestNet = GetBoolArg("-testnet");
-    fNoListen = GetBoolArg("-nolisten");
+    bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
+    fNoListen = GetBoolArg("-nolisten") || fTOR;
     fLogTimestamps = GetBoolArg("-logtimestamps");
 
     for (int i = 1; i < argc; i++)