]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 16 May 2017 12:38:59 +0000 (08:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 May 2017 12:38:59 +0000 (08:38 -0400)

Trivial merge