]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.5' into release-0.2.5 release-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Apr 2018 12:22:33 +0000 (08:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Apr 2018 12:22:33 +0000 (08:22 -0400)

Trivial merge