]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 18:46:27 +0000 (14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 18:46:27 +0000 (14:46 -0400)

Trivial merge