commit 131ab9d5233a2f452c608bf85a39255903d036c1 parent 289a7dbac32a981897e12a3c250f0b6c67eec809 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 23 Oct 2018 19:54:04 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" version to avoid removing rust use declaration.