]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a065ce 0b477bf)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:56:56 +0000 (14:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:56:56 +0000 (14:56 -0400)

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