[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 03867b3dd71f765e5adb620095692cb41798c273
Merge: e6ceded7d 3d6545250
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:37:26 2019 +1000

    Merge branch 'maint-0.4.2'

 doc/HACKING/CodingStandards.md | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)