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

[art at torproject.org]

commit 0e3e52c68f5fa6ac6926f2eb5e6eec4351711beb
Merge: c822750 41ea9d7
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri May 9 22:44:17 2014 +0200

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Update Readme to point to correct file location.
      state null check
      Refactorings
      removed unnecessary imports
      Store tor exit router's ip and name with every request

 README.md               |    2 +-
 ooni/templates/httpt.py |   42 +++++++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 14 deletions(-)