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

commit ac46e04feaf3efd9c97a68922678214d963df322 Merge: 58ac00fce 340fcc7e2 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .editorconfig | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)