commit 93def2bb4f2b7facd1a5a4d158143f09434e4667 Merge: 48afec91c a3342b382 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 17 19:12:08 2019 -0400 Merge branch 'maint-0.4.1' "ours" to avoid version bump.