Ignore bandwidth file lines with "vote=0"

As commented in https://trac.torproject.org/projects/tor/ticket/28563#comment:14

changed milestone to %Tor: 0.3.4.x-final

added 034-backport 035-backport 040-backport actualpoints::0.5 authority-test-completed component::core tor/tor merge-after-0403-alpha milestone::Tor: 0.3.4.x-final owner::teor points::1 priority::medium resolution::fixed reviewer::nickm reviewer::teor sbws-bwauth-test-completed severity::normal status::closed tor-bwauth type::defect labels

It probably should be backported to the minimum Tor version dirauths are running.

Trac:
Keywords: N/A deleted, 035-backport added

Trac:
Status: new to assigned
Owner: N/A to juga

https://github.com/torproject/tor/pull/805

Trac:
Status: assigned to needs_review

CI failed

Trac:
Status: needs_review to needs_revision

Marking for backport to 0.3.4, some directory authorities are still running 0.3.4: https://consensus-health.torproject.org/#authorityversions (In general, we ask directory authorities to be on the two latest stable versions. At the moment, that's 0.3.4 and 0.3.5.)

Juga, please rebase your patch on 0.3.4 before review. The parsing code changed between 0.3.4 and 0.3.5, so you may need a pull request for 0.3.4, and another pull request for 0.3.5.

Trac:
Keywords: N/A deleted, 034-backport added

Add parent since this might need to be reviewed with it

Trac:
Parent: N/A to #28563 (moved)

0.3.5: https://github.com/torproject/tor/pull/808 0.3.4: https://github.com/torproject/tor/pull/809

(haven't waited for CI)

Trac:
Status: needs_revision to needs_review

Trac:
Reviewer: N/A to nickm

This looks okay to me, but I would like to see a unit test to make sure that we don't ignore lines that say "vote=1" or "unmeasured=1" or "unmeasured=0".

Trac:
Status: needs_review to needs_revision

Trac:
Keywords: N/A deleted, 040-backport added

Added tests, modified one to remove things that were not needed and pushed in 035 the change teor suggested in 034

Trac:
Status: needs_revision to needs_review

lgtm.

Trac:
Status: needs_review to merge_ready

There is a changes file. The spec is in #29813 (moved). The CI passed on both pull requests, but 809 still shows travis as pending. That seems to be a GitHub bug.

The branches have fixups, so I need to do a squash.

The branches have the same effect, but the code changes are in different files. I was concerned about merge conflicts between 0.3.4 and 0.3.5. I did a merge from the 0.3.4 branch to 0.3.5, and copied over the code changes to the new directory structure.

Here are the pull requests:

• 0.3.4 squashed: https://github.com/torproject/tor/pull/820
• 0.3.5 merged: https://github.com/torproject/tor/pull/821
• master merged: https://github.com/torproject/tor/pull/822 (for testing)

Oops, there is an extra argument in dirserv_read_measured_bandwidths() in 0.3.5. Pushed a commit to 0.3.5 and re-did the master merge.

Trac:
Keywords: 034-backport deleted, 034-backport asn-merge added

Replying to teor:

Oops, there is an extra argument in dirserv_read_measured_bandwidths() in 0.3.5. Pushed a commit to 0.3.5 and re-did the master merge.

There is a 4th argument to dirserv_read_measured_bandwidths() in master.

If we backport any more calls to dirserv_read_measured_bandwidths(), we're going to have to be really careful.

So we need to merge:

• 0.3.4: ​https://github.com/torproject/tor/pull/820
• 0.3.5 and 0.4.0: ​https://github.com/torproject/tor/pull/821
• master: ​https://github.com/torproject/tor/pull/822

Edit: add 0.4.0 to the list.