commit 6afe1b00c9c73b1bfae4fede61791dff7e7be277 Merge: da1130413 4bac6b6e7 Author: David Goulet <dgoulet at torproject.org> Date: Wed Jun 26 11:39:33 2019 -0400 Merge branch 'tor-github/pr/1140'