]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Tue, 26 Apr 2016 23:27:39 +0000 (19:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 26 Apr 2016 23:27:39 +0000 (19:27 -0400)

Trivial merge