[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #29806 [Core Tor/Tor]: Ignore bandwidth file lines with "vote=0"
#29806: Ignore bandwidth file lines with "vote=0"
-------------------------------------------------+-------------------------
Reporter: juga | Owner: juga
Type: defect | Status:
| merge_ready
Priority: Medium | Milestone: Tor:
| 0.4.1.x-final
Component: Core Tor/Tor | Version:
Severity: Normal | Resolution:
Keywords: tor-bwauth, 040-backport, | Actual Points:
035-backport, 034-backport |
Parent ID: #28563 | Points: 1
Reviewer: nickm | Sponsor:
-------------------------------------------------+-------------------------
Comment (by teor):
There is a changes file.
The spec is in #29813.
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)
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/29806#comment:15>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs