commit 2e60e8a561cdaf793c08413665ac12df5f316557 Merge: c0c8658 becf4bc Author: Jacob Appelbaum <jacob@appelbaum.net> Date: Tue Nov 6 18:06:51 2012 -0800 Merge branch 'ipv6' into pending-changes src/torsocks.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)