]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Jul 2016 16:44:07 +0000 (12:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Jul 2016 16:44:07 +0000 (12:44 -0400)

Trivial merge