]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbd4a01 5c7c5e5)
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 21:13:28 +0000 (16:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 21:13:28 +0000 (16:13 -0500)

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