[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9
Merge: ccf1eb316 6107a2127
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jun 17 19:24:48 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 .editorconfig | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)