]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 14:44:01 +0000 (09:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 14:44:01 +0000 (09:44 -0500)

Trivial merge