commit 1f13c2bd231886a84ef2359e4e060179ce788f9a Merge: 2fca2ed49 2b54733dc Author: Nick Mathewson <nickm at torproject.org> Date: Thu May 2 14:33:09 2019 -0400 Merge branch 'maint-0.4.0' "ours" to avoid version bump.