]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a060d8 9063f29)
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:50:41 +0000 (12:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:51:20 +0000 (12:51 -0400)
("-s ours" merge to avoid taking reversion of #15064)


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