]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e606f19 491abbc)
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 22:20:55 +0000 (17:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 22:20:59 +0000 (17:20 -0500)
(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)


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