commit 038dbfc296cc9df3242ec735538d56004a0dcd3b Merge: e38e26d31 efe55b889 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jan 16 12:32:53 2019 -0500 Merge branch 'maint-0.3.5'