diff options
| -rw-r--r-- | changes/bug17772 | 7 | ||||
| -rw-r--r-- | src/or/routerlist.c | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/changes/bug17772 b/changes/bug17772 new file mode 100644 index 0000000000..54d457c601 --- /dev/null +++ b/changes/bug17772 @@ -0,0 +1,7 @@ + o Major bugfixes (guard selection): + - Actually look at the Guard flag when selecting a new directory + guard. When we implemented the directory guard design, we + accidentally started treating all relays as if they have the Guard + flag during guard selection, leading to weaker anonymity and worse + performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered + by Mohsen Imani. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 03729bda5c..79a5bb3910 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1501,8 +1501,14 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(node->identity, is_trusted_extrainfo)) continue; - if (for_guard && node->using_as_guard) - continue; /* Don't make the same node a guard twice. */ + /* Don't make the same node a guard twice */ + if (for_guard && node->using_as_guard) { + continue; + } + /* Ensure that a directory guard is actually a guard node. */ + if (for_guard && !node->is_possible_guard) { + continue; + } if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { |