[tor-bugs] #25074 [Core Tor/Tor]: TROVE-2018-001

[Tor Bug Tracker & Wiki]

#25074: TROVE-2018-001
---------------------------------------+-----------------------------------
 Reporter:  teor                       |          Owner:  nickm
     Type:  defect                     |         Status:  merge_ready
 Priority:  Medium                     |      Milestone:  Tor:
                                       |  0.3.3.x-final
Component:  Core Tor/Tor               |        Version:
 Severity:  Normal                     |     Resolution:
 Keywords:  033-must, review-group-33  |  Actual Points:
Parent ID:                             |         Points:
 Reviewer:  catalyst                   |        Sponsor:
---------------------------------------+-----------------------------------
Changes (by catalyst):

 * status:  needs_review => merge_ready


Comment:

 Patches look ok to me, after manually resolving conflicts as teor
 suggested.  Manually built and ran `make check` on what I hope are the
 same configurations as we have in Travis: Ubuntu 16.04 {gcc,clang}*{rust
 ,no-rust}. (except for cargo-offline) These were on master because that's
 where i did the conflict resolution; if there's a need to check 0.3.3
 separately I can do that too.

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