commit d46969e8208394640d9fe84edbc428329d4ec642 Merge: c42071f75 92ae9bb95 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jun 21 09:01:06 2018 -0400 Merge branch 'maint-0.3.4' "Ours" merge to avoid version bump.