]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11edbf4 12a7298)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2016 13:59:18 +0000 (09:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2016 13:59:18 +0000 (09:59 -0400)

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