[tor-commits] [tor/master] Merge remote-tracking branch 'chelseakomlo/documentation_integ_tests'

[nickm at torproject.org]

commit 99ec44de45e6fb38af0a99b82728f7d359ca5bf5
Merge: 5b5ec52 dfde58d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 14 11:32:53 2017 -0400

    Merge remote-tracking branch 'chelseakomlo/documentation_integ_tests'

 doc/HACKING/CodingStandards.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)