]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'juga/editorconfig'
authorNick Mathewson <nickm@torproject.org>
Sun, 17 Jun 2018 23:24:58 +0000 (19:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 17 Jun 2018 23:24:58 +0000 (19:24 -0400)

Trivial merge