[tor-bugs] #18616 [Core Tor/Tor]: Make begindir advertise checks consistent with DirPort checks

[Tor Bug Tracker & Wiki]

#18616: Make begindir advertise checks consistent with DirPort checks
-------------------------------------------------+-------------------------
 Reporter:  toralf                               |          Owner:  teor
     Type:  defect                               |         Status:
 Priority:  Medium                               |  needs_review
Component:  Core Tor/Tor                         |      Milestone:  Tor:
 Severity:  Normal                               |  0.2.8.x-final
 Keywords:  regression, must-fix-before-028-rc,  |        Version:  Tor:
  TorCoreTeam201605, TorCoreTeam-                |  0.2.8.1-alpha
  postponed-201604, review-group-1               |     Resolution:
Parent ID:                                       |  Actual Points:  25
 Reviewer:  arma,teor                            |  hours
                                                 |         Points:  3
                                                 |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by nickm):

 * status:  merge_ready => needs_review
 * reviewer:  arma => arma,teor


Comment:

 There is a merge conflict in router.c between this code and code that was
 introduced in b8b5bccfd9f350c for #19003.

 Before I push this, I'd like one of you to review my merge commit in
 branch "bug18616-v4-merged_028" to make sure that I resolved the conflict
 correctly, and that we won't be creating more problems here.

 I have confirmed that it compiles and the unit tests still pass. Beyond
 that, who can say.

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