[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1367'

[nickm at torproject.org]

commit c11c1d06234151c79a77ef6fdd2f34679cf6d64e
Merge: e39423c78 b4aeeb77b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 12 12:18:14 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/1367'

 changes/doc31853               |  3 +++
 doc/HACKING/CodingStandards.md | 33 +++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)