commit c2a326d34f18b23f4e772f9290bde6bfa180c220 parent 0fe9657c8c9181a6623fdb69000f28a3cd2c9a59 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 26 Jun 2019 09:50:12 -0400 Merge branch 'maint-0.4.1' "ours" to avoid the 0.4.1 version of #30871.
