diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-06 18:45:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-06 18:45:15 +0200 |
| commit | 330c190958a31a126de7a7b12124070300b1567b (patch) | |
| tree | f5a43d970c66709ea15ed44b0b5a7e63f880c82c /src/init.cpp | |
| parent | e74e8a184a70287e1f438e81a7b8ffc2bf09c46d (diff) | |
| parent | bd1e54bc0b7f1bdfc571edf1f4f1ecf422260b8c (diff) | |
| download | bitcoin-330c190958a31a126de7a7b12124070300b1567b.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index c328ca37d7..eeb22bbaf1 100644 --- 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++) |