]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 8 Mar 2017 15:12:06 +0000 (10:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Mar 2017 15:12:06 +0000 (10:12 -0500)

Trivial merge