Bug40168+34088 v2
Merge request for bug40168 and 34088, against master (forward merge of 035 backport branch).
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.
Merge request for bug40168 and 34088, against master (forward merge of 035 backport branch).