]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Oct 2015 15:20:38 +0000 (11:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Oct 2015 15:20:38 +0000 (11:20 -0400)

Trivial merge