diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-11 10:15:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-11 10:15:03 -0500 |
| commit | cb065a55bd209b9c23bc14119c2403680b087885 (patch) | |
| tree | 0e507b155339a46e50efe691a119b484927ce27b | |
| parent | cb28fe486ff7f9ebc81a7ccc90f5459429572587 (diff) | |
| parent | aae4ebf63f4da02ff35b063bbaa744379fbfc1e1 (diff) | |
| download | tor-cb065a55bd209b9c23bc14119c2403680b087885.tar tor-cb065a55bd209b9c23bc14119c2403680b087885.tar.gz | |
Merge remote-tracking branch 'karsten/one-dirauth'
| -rw-r--r-- | changes/bug10842 | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug10842 b/changes/bug10842 new file mode 100644 index 000000000..0ead9e7db --- /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. 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)) { |