[tor-bugs] #9729 [Tor]: Make bridges publish additional ORPort addresses in their descriptor

[Tor Bug Tracker & Wiki]

#9729: Make bridges publish additional ORPort addresses in their descriptor
-------------------------+-------------------------------------------------
     Reporter:  sqrt2    |      Owner:
         Type:           |     Status:  needs_revision
  enhancement            |  Milestone:  Tor: 0.2.6.x-final
     Priority:  normal   |    Version:  Tor: 0.2.5.1-alpha
    Component:  Tor      |   Keywords:  ORPort, bridge, multiple,
   Resolution:           |  addresses, 025-triaged
Actual Points:           |  Parent ID:
       Points:           |
-------------------------+-------------------------------------------------

Comment (by daube):

 G'day all,

 I'm getting close to knocking off all the issues listed in Nick's comment
 [comment:29]. But, before I do any more, I'd like to make sure that:

 A), I'm on the right track with the use of the MOCK macro and friends,
 and, B), That these changes are mergeable into master. At the minute, it
 looks as though the merge would conflict rather dramatically. Is there
 anything I can do to fix that? Should I branch off the current master, and
 try to re-apply my (and Benedikt's?) commits, or is there some more
 intelligent way?

 The current HEAD of my changes is here:
 https://github.com/kdmurray91/kdm-tor/tree/tik9729tests

 Thanks, and excuse my novice-ness,
 daube

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