]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f730e4 7605985)
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 20:57:36 +0000 (15:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 20:57:55 +0000 (15:57 -0500)
Use "ours" strategy" to avoid taking bug2402 fix.


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