]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 12:17:34 +0000 (08:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 12:17:34 +0000 (08:17 -0400)

Trivial merge