[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:  needs_review
 Priority:  High                            |      Milestone:  Tor:
                                            |  0.4.3.x-final
Component:  Core Tor/Tor                    |        Version:
 Severity:  Normal                          |     Resolution:
 Keywords:  nt-service regression 043-must  |  Actual Points:
Parent ID:  #32883                          |         Points:  .1
 Reviewer:                                  |        Sponsor:
--------------------------------------------+------------------------------
Changes (by nickm):

 * status:  assigned => needs_review
 * priority:  Medium => High


Comment:

 On #32883, teor says:
 >  Let's revert this change.
 >
 > The revert might be complicated. I did an "ours" merge of #32778 to
 avoid conflicts with the code in this ticket, which we now want to revert.
 Let's make sure that #32778 ends up in master for 0.4.3, and this code
 does not.
 >
 > Let's make a new PR that reverts PR 1635, and merges PR 1634.

 I've made a new branch here, `ticket32984` with PR at
 https://github.com/torproject/tor/pull/1671 . It is made of two `git
 revert`s, and one `git cherry-pick`.

 I have not reverted b6f099672b90cb6 ("Make ntmain.h functions stubs when
 NT_SERVICE not enabled."), since that's a harmless code cleanup. (famous
 last words?)

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