commit 902b34a0debeee92cb5844ec87c55db9f447562b Merge: 2d0a6d769 affbe376f Author: Nick Mathewson <nickm at torproject.org> Date: Tue Sep 11 15:53:06 2018 -0400 Merge branch 'maint-0.3.4'