commit 1afdb5b6cc1d07d49d5c8f369e1493dd844acad9 parent add00045aa56c77b93b1fb4b3cf424588a7baf0e Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 22 May 2018 12:33:09 -0400 Merge branch 'maint-0.3.3' "Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005 fix, which touches the files in their old locations.
