]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 16:20:57 +0000 (11:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 16:20:57 +0000 (11:20 -0500)

Trivial merge