From 43145fc9f556ab155deed39b9738b75334278dcd Mon Sep 17 00:00:00 2001 From: Steven Murdoch Date: Tue, 10 Mar 2009 00:52:45 +0000 Subject: [PATCH] In tor-resolve, when the Tor client to use is specified by :, actually use the specified port rather than defaulting to 9050 svn:r18833 --- ChangeLog | 3 +++ src/tools/tor-resolve.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f37d1368e5..91ab990814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ Changes in version 0.2.1.14-??? - 2009-03-?? - Avoid trying to print raw memory to the logs when we decide to give up on downloading a given relay descriptor. Bugfix on 0.2.1.9-alpha. + - In tor-resolve, when the Tor client to use is specified by + :, actually use the specified port rather than + defaulting to 9050. Bugfix on 0.2.1.6-alpha. Changes in version 0.2.1.13-alpha - 2009-03-09 diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 100c8107a4..6ea2dc2352 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -388,7 +388,7 @@ main(int argc, char **argv) (int)socksport, (int)port_option); } else if (port_option) { socksport = port_option; - } else { + } else if (!socksport) { log_debug(LD_CONFIG, "defaulting to port 9050"); socksport = 9050; }