maurice_pibouin authored Sep 23, 2020 and Nick Mathewson committed Sep 23, 2020

   [This is a squashed patch for ticket 7193, based on taking a "git
   diff" for the original branch, then applying it with "git apply
   -3".  I earlier attempted to squash the branch with "git rebase",
   but there were too many conflicts. --nickm]