commit 4e439cd4010c7a6e511470a84ebf1ca830305fb3 Merge: 2e88ba985 cc09ff253 Author: Nick Mathewson <nickm at torproject.org> Date: Sun Jun 17 19:24:58 2018 -0400 Merge remote-tracking branch 'juga/editorconfig' doc/HACKING/CodingStandards.md | 3 +++ 1 file changed, 3 insertions(+)