commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73 parent 3d1a7d7dd7e10b9500953701cfd29b9aaa64862a Author: teor <teor@torproject.org> Date: Tue, 12 Nov 2019 10:07:46 +1000 Merge branch 'maint-0.4.2' "git merge --strategy ours", because: * 32295 is a quick fix for 0.4.2 only * 32404 has a better implementation for master
