[tor-commits] [ooni-probe/develop] Merge pull request #76 from aagbsn/fix_import_rename

[isis at torproject.org]

commit 33ac20de5a4bb9e97f2fe8fbd081756a2022dd31
Merge: 875dc22 a96ceb2
Author: aagbsn <aagbsn at extc.org>
Date:   Tue Apr 30 03:51:41 2013 -0700

    Merge pull request #76 from aagbsn/fix_import_rename
    
    Fix import conflict

 nettests/experimental/tls_handshake.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)