Merge branch 'real_ipv6_fix' into maint-0.2.1
commit4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9
authorNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:42:05 +0000 (6 13:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:42:05 +0000 (6 13:42 -0500)
treee523da5e4c755ad600beb09fc59f497124713c4f
parent0f637492e30e19ad7abeedafdd58c087f01b4527
parent2ce132e335d60c7ef1d01aa00db5ab4c5b7d674f
Merge branch 'real_ipv6_fix' into maint-0.2.1