commit 632d6cbc430eb1d5d764321fb2a6e6c27fe849e3 Merge: a6587e907 7b5919966 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 12 09:07:49 2017 -0500 Merge remote-tracking branch 'teor/doc24596' doc/HACKING/CodingStandards.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)