commit 790062d7204dc94690e0bc4531e072e96a0e80ed Merge: 8e3a52e5c b74ed31f9 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 9 09:22:13 2018 -0400 Merge branch 'maint-0.3.4'