commit 48187248d3f79243590d60285708f3e2d45f8d8f Merge: 7e111d0ea fb541ffca Author: teor <teor at torproject.org> Date: Thu Jan 16 10:00:47 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2