commit d409565e38d44c6f2fb08b4b2d37c76597e3d951 Merge: 0d124488f 8ed4f1ee8 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5