commit 67a5d4cb60a9f27e981b83195cf47183a7e9abcc Merge: 2df7f1d59 55fef0534 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 8 15:11:07 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/ticket23368'

doc/HACKING/CodingStandards.md | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)