]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ipv6_exits'
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2012 19:45:15 +0000 (14:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2012 19:45:15 +0000 (14:45 -0500)

Trivial merge