]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/lcov_excl'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Apr 2016 18:05:51 +0000 (14:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Apr 2016 18:05:51 +0000 (14:05 -0400)

Trivial merge