diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-10-17 18:54:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 23:53:49 -0400 |
| commit | ad3da535366aeb9b7441f4881899758bc7475168 (patch) | |
| tree | 90de3a8a4f1a5d8bd204b9afdf717b979e30792e /src/or/config.c | |
| parent | 82178a81f6748c9b26bdc8a5da36dd34b689281b (diff) | |
| download | tor-ad3da535366aeb9b7441f4881899758bc7475168.tar.gz tor-ad3da535366aeb9b7441f4881899758bc7475168.zip | |
If EntryNodes and ExcludeNodes overlap, obey ExcludeNodes.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 9675c73c99..bd904dcf0b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1412,7 +1412,8 @@ options_act(or_options_t *old_options) /* Check if we need to parse and add the EntryNodes config option. */ if (options->EntryNodes && (!old_options || - (!routerset_equal(old_options->EntryNodes,options->EntryNodes)))) + !routerset_equal(old_options->EntryNodes,options->EntryNodes) || + !routerset_equal(old_options->ExcludeNodes,options->ExcludeNodes))) entry_nodes_should_be_added(); /* Since our options changed, we might need to regenerate and upload our |