summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-30 12:07:43 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-30 12:07:43 -0500
commitd459c08b7d5cb1766bda5443ea2750bca160212d (patch)
tree0a1e1ea342dc786ca140a04ce8f085b42c4d014f /src
parent766d0a2d98591ed840cce42710c5a59a2e7dc731 (diff)
parent91cee3c9e73aba089804cd88305115fc3ab1f76c (diff)
downloadtor-d459c08b7d5cb1766bda5443ea2750bca160212d.tar.gz
tor-d459c08b7d5cb1766bda5443ea2750bca160212d.zip
Merge branch 'trove-2017-012_030' into maint-0.3.0
Diffstat (limited to 'src')
-rw-r--r--src/or/entrynodes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index d762afdcfe..0109da8e01 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node)
node->is_stable &&
node->is_fast &&
node->is_valid &&
- node_is_dir(node));
+ node_is_dir(node) &&
+ !router_digest_is_me(node->identity));
}
/**