]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34a51d1 3c2d461)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:55:22 +0000 (14:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:55:22 +0000 (14:55 -0400)

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