GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.
This is the real MR, rebased onto 81.1.1.
My goal is that each fixup commit is a small and logical change.
Closes #40044 (closed) #40041 (closed)
This supersedes !21 (closed) and !23 (closed) (if those look good).