[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[teor at torproject.org]

commit aa73b30dfac927c565f553e93685e3c3dd4a2118
Merge: 7f43d24e0 3d6545250
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:37:21 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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