[tor-bugs] #18962 [Core Tor/Tor]: Merge feature 18483 cleaup commits to master

[Tor Bug Tracker & Wiki]

#18962: Merge feature 18483 cleaup commits to master
-------------------------------+------------------------------------
 Reporter:  teor               |          Owner:
     Type:  enhancement        |         Status:  needs_review
 Priority:  Medium             |      Milestone:  Tor: 0.2.9.x-final
Component:  Core Tor/Tor       |        Version:
 Severity:  Normal             |     Resolution:
 Keywords:  TorCoreTeam201605  |  Actual Points:
Parent ID:  #18483             |         Points:  small
 Reviewer:  nickm              |        Sponsor:
-------------------------------+------------------------------------
Changes (by nickm):

 * reviewer:   => nickm


Comment:

 These commits looked okay to me; I reviewed feature18483-cleanup since I
 couldn't find the other branch.

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