[tor-commits] [tor/master] Merge branch 'contributing'

[nickm at torproject.org]

commit cbb13df8080b660e5d20962c31c8744ed190d2e9
Merge: f6c96fd0c f7949a440
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 11 17:59:09 2018 -0400

    Merge branch 'contributing'

 CONTRIBUTING                   | 39 +++++++++++++++++++++++++++++++++++++++
 Makefile.am                    |  1 +
 doc/HACKING/CodingStandards.md | 18 ++++++++++++++++++
 3 files changed, 58 insertions(+)