]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec22ea f37d24c)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Oct 2011 20:49:52 +0000 (16:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Oct 2011 20:49:59 +0000 (16:49 -0400)
This merge is here to take a commit (feature 3951) that we already
have in master, so use "merge -s ours"


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