aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-11 10:15:03 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-11 10:15:03 -0500
commitcb065a55bd209b9c23bc14119c2403680b087885 (patch)
tree0e507b155339a46e50efe691a119b484927ce27b /src
parentcb28fe486ff7f9ebc81a7ccc90f5459429572587 (diff)
parentaae4ebf63f4da02ff35b063bbaa744379fbfc1e1 (diff)
downloadtor-cb065a55bd209b9c23bc14119c2403680b087885.tar
tor-cb065a55bd209b9c23bc14119c2403680b087885.tar.gz
Merge remote-tracking branch 'karsten/one-dirauth'
Diffstat (limited to 'src')
-rw-r--r--src/or/directory.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index ec1e776f0..fd4e79638 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -287,8 +287,12 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
if ((type & ds->type) == 0)
continue;
- if (exclude_self && router_digest_is_me(ds->digest))
+ if (exclude_self && router_digest_is_me(ds->digest)) {
+ /* we don't upload to ourselves, but at least there's now at least
+ * one authority of this type that has what we wanted to upload. */
+ found = 1;
continue;
+ }
if (options->StrictNodes &&
routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) {