]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3455274 8d9602c)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 May 2014 13:17:34 +0000 (09:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 May 2014 13:17:34 +0000 (09:17 -0400)
This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.


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