]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19e5b4c 5dbaf9d)
Merge remote branch 'sebastian/bug2504' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 17:47:21 +0000 (12:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 17:47:21 +0000 (12:47 -0500)

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