]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad49b8a 758428d)
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 14:19:46 +0000 (10:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 14:19:46 +0000 (10:19 -0400)
(Using an -s ours merge for Not taking the CVE-2012-2250 fix from
maint-0.2.3; it would conflict.)


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