]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Jul 2017 13:30:40 +0000 (09:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Jul 2017 13:30:40 +0000 (09:30 -0400)

Trivial merge