commit 9ec9589c3a5123c957471d3bcbd6219bdfb070c7 Merge: db71d42 934f85f Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 10 10:03:22 2017 -0400

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

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