]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ad8133 bb9b4c3)
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Thu, 8 May 2014 03:11:32 +0000 (23:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 May 2014 03:11:32 +0000 (23:11 -0400)

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