nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2014-02-11 10:15:03 -05:00
commit cb065a55bd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug10842 Normal file
View File

@ -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.

6
src/or/directory.c
View File

@ -287,8 +287,12 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
if ((type & ds->type) == 0) if ((type & ds->type) == 0)
continue; 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; continue;
}
if (options->StrictNodes && if (options->StrictNodes &&
routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) { routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) {