commit 189287e7bc3c4cb5080c4b6c177121c6e69569f3 Merge: aa73b30df eb8170408 Author: teor <teor@torproject.org> Date: Mon Nov 25 12:50:59 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)