[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art at torproject.org]

commit 0c702b6f957992d2dbe0be8356b80c3efc2e129d
Merge: 0daffad de4a8ea
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Feb 20 12:08:50 2014 +0000

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Minor fixes to comments
      DNS-host-resolution-for-tls_handshake
      Bug-Fixes-for-tls_handshake

 ooni/nettests/experimental/tls_handshake.py |   36 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)