]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c066f2d 306f2f0)
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 20:25:11 +0000 (16:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 20:25:11 +0000 (16:25 -0400)

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