]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Jul 2017 14:03:22 +0000 (10:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Jul 2017 14:03:22 +0000 (10:03 -0400)

Trivial merge