[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:  teor
     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, asn-merge, merge-  |
  after-0403-alpha                               |
Parent ID:  #28563                               |         Points:  1
 Reviewer:  nickm, teor                          |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by teor):

 * status:  needs_revision => merge_ready


Comment:

 Ok, all fixed now.

 When I backport, I will merge:
 * maint-0.3.4: ​https://github.com/torproject/tor/pull/820
 * maint-0.3.5: ​https://github.com/torproject/tor/pull/821

 When asn merges to mainline, he needs to merge:
 * maint-0.4.0: https://github.com/torproject/tor/pull/847
 * then merge forward using git-merge-forward.sh

 The merge forward to master is a clean merge, we should check it passes CI
 at:
 https://github.com/torproject/tor/pull/822

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/29806#comment:26>
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