commit d04f6d9dffcb1f67c3fc693284810edee0f61f3d Merge: aa79196ee df3484b2b Author: Nick Mathewson <nickm at torproject.org> Date: Thu Feb 21 09:52:35 2019 -0500 Merge branch 'maint-0.4.0' "ours" to avoid version bump