commit 4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9 Merge: 0f63749 2ce132e Author: Nick Mathewson <nickm@torproject.org> Date: Sun Mar 6 13:42:05 2011 -0500 Merge branch 'real_ipv6_fix' into maint-0.2.1 changes/ipv6_crash | 5 +++-- src/or/routerparse.c | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-)