commit 9f0e8d8c032fadde93d2079d60eff289203a2fb9 Merge: 9ca1af9a8 0d5aaef46 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 7 15:14:03 2018 -0400 Merge branch 'maint-0.3.4'