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

[nickm at torproject.org]

commit cae7387ef2ddf6ed047904406e5bfc56686f27e6
Merge: 56ae6d876 74c767af2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 20 07:59:13 2018 -0400

    Merge branch 'maint-0.3.3'

 doc/HACKING/CodingStandardsRust.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)