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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2' into release-0.3.2

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