]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ca3295 d5ac79e)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Feb 2016 13:13:13 +0000 (08:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Feb 2016 13:13:13 +0000 (08:13 -0500)

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