]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3d11b1 1496056)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:13:54 +0000 (09:13 -0800)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:13:54 +0000 (09:13 -0800)

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