[tor-commits] [tor/master] Merge branch 'pr_883_squashed'

[nickm at torproject.org]

commit b547ece92fc85497947fdb1b113aa5a387a3d313
Merge: fdee4dd50 0ebe29019
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 3 08:32:21 2019 -0400

    Merge branch 'pr_883_squashed'

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