]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b4b137 9e44df2)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Wed, 23 Apr 2014 15:04:10 +0000 (11:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 Apr 2014 15:04:10 +0000 (11:04 -0400)
This is an "ours" merge, to avoid taking the 0.2.4 version of the


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