diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-22 11:43:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:23:32 -0400 |
| commit | 13a31e72db1b009623aa55bd52ffe7390a22623d (patch) | |
| tree | 85eb1d196ffa02c586ef80bebd00fa1facdf57eb /src/or/or.h | |
| parent | c20e34e1894bed07982fe64d60a1b3fe9403d269 (diff) | |
| download | tor-13a31e72db1b009623aa55bd52ffe7390a22623d.tar.gz tor-13a31e72db1b009623aa55bd52ffe7390a22623d.zip | |
Never vote for an ed key twice.
When generating a vote, and we have two routerinfos with the same ed
key, omit the one published earlier.
This was supposed to have been solved by key pinning, but when I
made key pinning optional, I didn't realize that this would jump up
and bite us. It is part of bug 18318, and the root cause of 17668.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4496cbcec3..b6d6ec074f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2081,6 +2081,10 @@ typedef struct { * tests for it. */ unsigned int needs_retest_if_added:1; + /** Used during voting to indicate that we should not include an entry for + * this routerinfo. Used only during voting. */ + unsigned int omit_from_vote:1; + /** Tor can use this router for general positions in circuits; we got it * from a directory server as usual, or we're an authority and a server * uploaded it. */ |