]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 183d465 2ce99b9)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Apr 2016 14:45:46 +0000 (10:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Apr 2016 14:45:46 +0000 (10:45 -0400)

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