]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 562c974 bcca541)
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2011 22:49:41 +0000 (17:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2011 22:49:41 +0000 (17:49 -0500)

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