]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.8' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 14:07:28 +0000 (09:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 14:07:28 +0000 (09:07 -0500)

Trivial merge