]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'arma/bug16844-logs'
authorNick Mathewson <nickm@torproject.org>
Tue, 18 Aug 2015 13:19:39 +0000 (09:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 18 Aug 2015 13:19:39 +0000 (09:19 -0400)

Trivial merge