aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-01-02 05:14:21 +0000
committerRoger Dingledine <arma@torproject.org>2006-01-02 05:14:21 +0000
commit358052416d5ac02ae2206417deab6e99c0c087b5 (patch)
tree3c06928df3197ea752a7cd628bd844ffa8799c5d
parentddf070e204dfc4a11fe7f541317023360a45ad9c (diff)
downloadtor-358052416d5ac02ae2206417deab6e99c0c087b5.tar
tor-358052416d5ac02ae2206417deab6e99c0c087b5.tar.gz
bugfix: only try to use the EntryNodes config option if it is set.
svn:r5701
-rw-r--r--src/or/config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index cccf4bfdf..cef5be524 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -704,8 +704,9 @@ options_act(or_options_t *old_options)
}
/* Check if we need to parse and add the EntryNodes config option. */
- if (!old_options ||
- !opt_streq(old_options->EntryNodes, options->EntryNodes))
+ if (options->EntryNodes &&
+ (!old_options ||
+ !opt_streq(old_options->EntryNodes, options->EntryNodes)))
entry_nodes_should_be_added();
/* Since our options changed, we might need to regenerate and upload our