commit 677048fe9fd04363f1709aa9df7596d70fe542d6 Merge: 9323f5d1d d0007db1f Author: Nick Mathewson <nickm at torproject.org> Date: Thu Aug 23 20:44:16 2018 -0400 Merge branch 'maint-0.3.4'