]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.7' into release-0.2.7 release-0.2.7
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:53:11 +0000 (07:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:53:11 +0000 (07:53 -0500)

Trivial merge