]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3681463 c14c662)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:48:35 +0000 (10:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:48:35 +0000 (10:48 -0400)

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