This is an "ours" merge, taking nothing, since we already had the changes that were in a83abcf5ee5cb8fe245bc97e0
Nick Mathewson