]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 452aa18 a83abcf)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:55:55 +0000 (13:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:55:55 +0000 (13:55 -0400)
This is an "ours" merge, taking nothing, since we already had the
changes that were in a83abcf5ee5cb8fe245bc97e0


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