summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 14:28:38 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-09 10:30:52 -0400
commit7f95ef6e66754112e7a84e4da83ed754b1dc9626 (patch)
tree6c5556e1a529ef87c13afeb9192b453d01e65365 /src/or/router.c
parent039e2a24da522f483909e0eb55f963dce6e3b0e5 (diff)
downloadtor-7f95ef6e66754112e7a84e4da83ed754b1dc9626.tar.gz
tor-7f95ef6e66754112e7a84e4da83ed754b1dc9626.zip
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index ef54921bfe..798998a2f5 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1647,8 +1647,7 @@ MOCK_IMPL(int,
server_mode,(const or_options_t *options))
{
if (options->ClientOnly) return 0;
- /* XXXX I believe we can kill off ORListenAddress here.*/
- return (options->ORPort_set || options->ORListenAddress);
+ return (options->ORPort_set);
}
/** Return true iff we are trying to be a non-bridge server.