]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 483385d 8b6d0bd)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Jun 2013 05:48:16 +0000 (01:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Jun 2013 05:48:16 +0000 (01:48 -0400)
Using "ours" strategy to avoid taking commits


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