]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66624de fa1034c)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Oct 2013 20:09:45 +0000 (16:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Oct 2013 20:09:45 +0000 (16:09 -0400)
Using "ours" strategy since we already merged the equivalent of #9866
into this branch.


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