]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6416f3 3202ac6)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Mon, 20 Oct 2014 14:33:53 +0000 (10:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 20 Oct 2014 14:33:53 +0000 (10:33 -0400)
This is an "ours" merge so we can leave the version in master alone.


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