]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:18:03 +0000 (08:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:18:03 +0000 (08:18 -0400)

Trivial merge