]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cedc651 c26e310)
Merge remote-tracking branch 'linus/bug_11061'
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jul 2015 18:38:52 +0000 (14:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jul 2015 18:38:52 +0000 (14:38 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git