[tor-bugs] #18809 [Core Tor/Tor]: Handle linked connections better during bootstrap

[Tor Bug Tracker & Wiki]

#18809: Handle linked connections better during bootstrap
-------------------------------------------------+-------------------------
 Reporter:  teor                                 |          Owner:  teor
     Type:  defect                               |         Status:
 Priority:  Medium                               |  merge_ready
Component:  Core Tor/Tor                         |      Milestone:  Tor:
 Severity:  Normal                               |  0.2.8.x-final
 Keywords:  must-fix-before-028-rc,              |        Version:  Tor:
  TorCoreTeam201605, review-group-1,   must-     |  0.2.8.1-alpha
  fix-before-0283                                |     Resolution:
Parent ID:                                       |  Actual Points:  4
 Reviewer:  andrea                               |         Points:  3
                                                 |        Sponsor:
                                                 |  SponsorS-can
-------------------------------------------------+-------------------------

Comment (by teor):

 I think everything is ok, because `git show
 d718c717a67051cb1da2a1f80c70401d0d10b374` gives me an empty patch. git
 show on a merge commit uses git diff-tree —cc, which removes hunks which
 match either parent. So I think we're ok here.

 (Is there another git command I should use? I tried `git diff-tree` but
 that gave me the same results.)

 Also, the functions are named correctly and all the unit tests pass, as
 does `make test-network-all`.

 My branch `fix18809-comment` explains that a consensus that's waiting for
 certificates fails after 20 minutes. And then we try again. It's a
 comment-only change.

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