Bug40076 044: Forward-port of !89 to 0.4.4

Nick Mathewsonrequested to merge
nickm/tor:bug40076_044 into master

This MR contains !89 (merged), plus a fix for a merge conflict in 0.4.4.

See #40076 (closed) .

Merge request reports