commit 844fc5eecb29092a7c1e8f91d0b66321703ad690 Merge: b8554dd88 9b9625bdf Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 9 09:09:02 2018 -0400 Merge branch 'maint-0.3.4'