commit 3bfbeff80db8d15dc47744fd49ad826b014a7b91 Merge: afa4cc57b 48187248d Author: teor <teor at torproject.org> Date: Thu Jan 16 10:00:51 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2