]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dfa244 4aac35c)
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Mar 2011 16:39:40 +0000 (12:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Mar 2011 16:39:40 +0000 (12:39 -0400)

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