commit c2a326d34f18b23f4e772f9290bde6bfa180c220 Merge: 0fe9657c8 648d5df62 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 26 09:50:12 2019 -0400
Merge branch 'maint-0.4.1'
"ours" to avoid the 0.4.1 version of #30871.
tor-commits@lists.torproject.org