[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

commit bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 Merge: 933b0c1b1 ffccf6fc5 Author: teor <teor@torproject.org> Date: Mon Dec 16 08:16:20 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2