commit 075fcb599c095d18ba554084b910619a6971cc44 Merge: b329cdf76 6c1d2549d Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 15 02:16:23 2018 -0400 Merge branch 'maint-0.3.4'