commit 2ef4bccb487aabf9465f912bbb92a0ee455e4dde Merge: 75732ef4c dd69e74e3 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .editorconfig | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)