[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6
Merge: 9713ecfc4 dd69e74e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jun 17 19:24:48 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

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