commit 2e5eb029282696f68267cd106235b854f79771ed Merge: d6aa6549b bfcfeaed0 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 2 13:22:14 2018 -0400 Merge branch 'maint-0.3.4'