commit 5db592522a762802e5d6f7c47f11d4e91dd35a06 Merge: 05d65cb06 131ab9d52 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 23 19:54:16 2018 -0400 Merge branch 'maint-0.3.5'