[tor-bugs] #32984 [Core Tor/Tor]: Revert #32883 for now and apply #32778 (so nt services can work in 0.4.3)

[Tor Bug Tracker & Wiki]

#32984: Revert #32883 for now and apply #32778 (so nt services can work in 0.4.3)
-------------------------------------------------+-------------------------
 Reporter:  nickm                                |          Owner:  nickm
     Type:  defect                               |         Status:  closed
 Priority:  High                                 |      Milestone:  Tor:
                                                 |  0.4.3.x-final
Component:  Core Tor/Tor                         |        Version:
 Severity:  Normal                               |     Resolution:  fixed
 Keywords:  nt-service regression 043-must       |  Actual Points:  .1
  BugSmashFund                                   |
Parent ID:  #32883                               |         Points:  .1
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by teor):

 * status:  merge_ready => closed
 * resolution:   => fixed


Comment:

 Merged to master.

 Merged #32962, #32984, and #20218 together.

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