From ebe7e22045327d2352c1a7582759d46e966d69e0 Mon Sep 17 00:00:00 2001 From: Karsten Loesing Date: Sat, 8 Feb 2014 11:02:27 +0100 Subject: [PATCH 1/2] Suppress warning in networks with only 1 dirauth. --- src/or/directory.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index ec1e776f03..fd4e79638b 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)) { From aae4ebf63f4da02ff35b063bbaa744379fbfc1e1 Mon Sep 17 00:00:00 2001 From: Karsten Loesing Date: Tue, 11 Feb 2014 08:44:35 +0100 Subject: [PATCH 2/2] Add changes file for ticket 10842. This is a bugfix on 0.2.2.26-beta, because 6b83b3b made directory authorities remove themselves from the list of directory authorities to upload to, but didn't suppress the warning in case they're the only directory authority in the network. --- changes/bug10842 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/bug10842 diff --git a/changes/bug10842 b/changes/bug10842 new file mode 100644 index 0000000000..0ead9e7db8 --- /dev/null +++ b/changes/bug10842 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Suppress a warning that votes and signatures cannot be uploaded to + other directory authorities if there's only one directory authority + in the network. Bugfix on 0.2.2.26-beta. Resolves ticket 10842.