]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2042080 e718a58)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 16:55:54 +0000 (12:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 16:55:54 +0000 (12:55 -0400)
'ours' merge to avoid bumping version.


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