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

[art at torproject.org]

commit 7b8637806845a6dcb295368d7074d7580d679f7e
Merge: b97ee25 8e1b6ba
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Nov 11 19:39:23 2012 +0100

    Merge branch 'master' of github.com:hellais/ooni-probe
    
    * 'master' of github.com:hellais/ooni-probe:
      Update nettests/core/url_list.py
      Update nettests/core/url_list.py

 nettests/core/url_list.py |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)