[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:
-------------------------------+------------------------------------

Comment (by teor):

 Replying to [comment:3 nickm]:
 > These commits looked okay to me; I reviewed feature18483-cleanup since I
 couldn't find the other branch.

 See #18483 for the changes in #18483 due to #18929.
 I also rebased this branch feature18483-cleanup-v2 on top of the latest
 #18483, it can go in 0.2.9 because it's all cosmetic. Or 0.2.8 if you
 want.

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