[tor-bugs] #23681 [Core Tor/Tor]: prop224: Clients mark intro circs as timed-out within seconds

[Tor Bug Tracker & Wiki]

#23681: prop224: Clients mark intro circs as timed-out within seconds
-------------------------------------------------+-------------------------
 Reporter:  asn                                  |          Owner:  dgoulet
     Type:  defect                               |         Status:
                                                 |  merge_ready
 Priority:  High                                 |      Milestone:  Tor:
                                                 |  0.3.1.x-final
Component:  Core Tor/Tor                         |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  prop224, tor-hs, 031-backport,       |  Actual Points:
  030-backport                                   |
Parent ID:                                       |         Points:
 Reviewer:  mikeperry                            |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by nickm):

 * keywords:  prop224, tor-hs => prop224, tor-hs, 031-backport, 030-backport
 * milestone:  Tor: 0.3.2.x-final => Tor: 0.3.1.x-final


Comment:

 Okay.  So, I've rebased it onto 0.2.9 (since if I understand you right,
 that's as far as we might ''ever'' want to backport) and squashed it as
 `bug23681_029_01_squashed`.  Only taking it in 0.3.2 and later for now
 though.  (Merging to 0.3.2 and forward!)

 (Git note: From a git convenience POV, it's easiest to have a branch
 that's based on the earliest convenient* version that we think we might
 want to backport onto.  That way, I can merge the branch to 0.3.2 now, and
 then later either merge the branch to 0.3.1 or 0.2.9 or not.)

 ([*] Of course, this isn't a good idea when the code has changed a lot
 between branches.  If there are huge conflicts, it makes sense to do
 separate branches.)

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