[tor-bugs] #24898 [Core Tor/Tor]: We have two conflicting notions of channel_is_client()

Tor Bug Tracker & Wiki blackhole at torproject.org
Wed Jan 31 08:26:35 UTC 2018


#24898: We have two conflicting notions of channel_is_client()
-------------------------------------------------+-------------------------
 Reporter:  arma                                 |          Owner:  (none)
     Type:  defect                               |         Status:
                                                 |  merge_ready
 Priority:  Medium                               |      Milestone:  Tor:
                                                 |  0.2.9.x-final
Component:  Core Tor/Tor                         |        Version:  Tor:
                                                 |  0.3.1.1-alpha
 Severity:  Normal                               |     Resolution:
 Keywords:  tor-relay, 032-backport,             |  Actual Points:
  031-backport, 030-backport-maybe-with-21406,   |
  029-backport-maybe-with-21406                  |
Parent ID:  #24902                               |         Points:  0.5
 Reviewer:  teor                                 |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by arma):

 * status:  needs_revision => merge_ready


Comment:

 Ok, I added a second commit to my {{{bug24898-029}}} branch that backports
 that part from #22805. I think we are good to go now.

 To be clear, that means commit 4bd208b wants to make it into 0.2.9 and
 0.3.0, and its changes are already present in 0.3.1. Whereas commit
 2076db4 wants to make it into 0.2.9 and 0.3.0 and 0.3.1, and its changes
 are already present in 0.3.2.

 Sorry in advance for the mess Nick. I would just merge it all myself but I
 think I would screw up the "ours" aspects of the conflict handling. :)

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/24898#comment:21>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list