commit 8d616a1a49a0f5433966a16b17a20121fc2845fd Merge: 64d691423 bb786797a Author: teor <teor at torproject.org> Date: Thu Dec 5 10:14:16 2019 +1000 Merge branch 'maint-0.4.2'