]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9116f49 9e2608b)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Oct 2014 13:23:53 +0000 (09:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Oct 2014 13:23:53 +0000 (09:23 -0400)

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