commit 2e88ba985ded9c3e72c60e426c96469c6cde804f Merge: 1de722d7a 70e672f85 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.4' .editorconfig | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)