]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2016 17:54:21 +0000 (13:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2016 17:54:21 +0000 (13:54 -0400)

Trivial merge