Browse Source

Merge remote-tracking branch 'karsten/one-dirauth'

Nick Mathewson 10 years ago
parent
commit
cb065a55bd
2 changed files with 9 additions and 1 deletions
  1. 4 0
      changes/bug10842
  2. 5 1
      src/or/directory.c

+ 4 - 0
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.

+ 5 - 1
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)) {