]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ec5e24 e8e89fd)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:10:44 +0000 (10:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:10:44 +0000 (10:10 -0500)

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