From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Nov 2012 19:45:15 +0000 (-0500)
Subject: Merge branch 'ipv6_exits'
X-Git-Tag: tor-0.2.4.7-alpha~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca0c71551e519a1d27cec5db9c9e6722a382d19d;p=thirdparty%2Ftor.git

Merge branch 'ipv6_exits'
---

ca0c71551e519a1d27cec5db9c9e6722a382d19d