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

commit e24a36b3faf4bd3f80ddc7f86042b6ccfb6479a0 Merge: 1937d56 0c4f767 Author: Arturo Filastò <art@fuffa.org> Date: Sun Jan 12 15:43:18 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Properly format the copyright file. Add empty setup.cfg to make debuild happy. Add logo to README.