]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8' into release-0.2.8 release-0.2.8
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Dec 2017 15:58:20 +0000 (10:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Dec 2017 15:58:20 +0000 (10:58 -0500)

Trivial merge