"ours" merge to avoid version bump.

Comment-only change.

Without the hs_init(), the caches are not initialized and the previous commit
was causing an assert due to the missing caches.

But regardless of that, those tests were not initializing but were calling
hs_free_all().

Signed-off-by: David Goulet <dgoulet@torproject.org>

When the ONION_CLIENT_AUTH_REMOVE command is given to tor, now also remove the
descriptor associated with the client authorization credentials.

Fixes #33148

Signed-off-by: David Goulet <dgoulet@torproject.org>

Fixes bug 33103; bugfix on 0.4.3.1-alpha.

David Goulet authored Jan 30, 2020 and teor committed Feb 06, 2020

Fixes #32230

Signed-off-by: David Goulet <dgoulet@torproject.org>

And improve inline function spacing, and function declaration
spacing.

Comment-only change.

On windows you can't os.rename() a file if the target filename
already exists.

Closes ticket 32372.

Fixes #33139.

Signed-off-by: David Goulet <dgoulet@torproject.org>

Fixes: https://trac.torproject.org/projects/tor/ticket/32791#comment:3
Unblocks: #1686