[tor-commits] [tor/master] Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'

[nickm at torproject.org]

commit 720552b04c86e1b823d12bfde71ba052f4246e1c
Merge: 139799c 24d29c7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 6 09:30:40 2017 -0400

    Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'

 doc/HACKING/CodingStandards.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)