commit 05cd3224a034e83ec60a1090319a450ce431eeb0 Merge: bf5704051 81e529d23 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.4'