Revert #32883 for now and apply #32778 (so nt services can work in 0.4.3)

In theory, #32883 (moved) was a better solution for the problem that #32778 (moved) was supposed to solve. In practice, it seems to break nt services on master. We should revert it for now until we have time to debug it in a later alpha series.

changed milestone to %Tor: 0.4.3.x-final

Trac:
Parent Ticket: #32883 (moved)

added 043-must BugSmashFund actualpoints::.1 component::core tor/tor milestone::Tor: 0.4.3.x-final nt-service owner::nickm parent::32883 points::.1 priority::high regression resolution::fixed severity::normal status::closed type::defect labels

Trac:
Keywords: N/A deleted, nt-service regression 043-must added

Trac:
Summary: Revert #32883 (moved) for now and apply #32778 (moved) to Revert #32883 (moved) for now and apply #32778 (moved) (so nt services can work in 0.4.3)
Description: N/A

to

In theory, #32883 (moved) was a better solution for the problem that #32778 (moved) was supposed to solve. In practice, it seems to break nt services on master. We should revert it for now until we have time to debug it in a later alpha series.

On #32883 (moved), teor says:

Let's revert this change.

The revert might be complicated. I did an "ours" merge of #32778 (moved) to avoid conflicts with the code in this ticket, which we now want to revert. Let's make sure that #32778 (moved) 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 reverts, 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?)

Trac:
Priority: Medium to High
Status: assigned to needs_review

Trac:
Actualpoints: N/A to .1

4f88eb84 + c8b6392b looks good (except for "Please upgrade!" message).

Trac:
Username: Vort

Thanks for testing!

Looks fine to me!

Trac:
Status: needs_review to merge_ready

Trac:
Keywords: nt-service regression 043-must deleted, nt-service regression 043-must BugSmashFund added

Merged to master.

Merged #32962 (moved), #32984 (moved), and #20218 (moved) together.

Trac:
Status: merge_ready to closed
Resolution: N/A to fixed

closed

changed time estimate to 48m

added 48m of time spent

mentioned in issue #32883 (moved)

moved to tpo/core/tor#32984 (closed)