commit 391756f262c93d4361fb6189a3ba9704283f73aa Merge: bfab1dda2 ffaf180b7 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.4'