[tor-commits] [ooni-probe/develop] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

Thu Jun 6 16:41:39 UTC 2013

commit 3f9035f84fc5d4e4ba59a018e49d1a1a98ba3ca8
Merge: ec46497 85a671b
Author: Arturo FilastÃ² <art at fuffa.org>
Date:   Sat May 18 19:13:30 2013 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
    
    * 'master' of ssh://git-rw.torproject.org/ooni-probe:
      Remove really old Makefile which seems to no longer point to valid directories.
      Remove oonib report archival script.
      Remove line to ignore oonib/oonibackend.conf from .gitignore.
      Remove log factory for oonib from ooni/utils/log.py.
      Remove old bin/oonib script.

 .gitignore                 |    1 -
 Makefile                   |  202 --------------------------------------------
 bin/oonib                  |   36 --------
 ooni/utils/log.py          |   15 ----
 scripts/archive_reports.py |  174 --------------------------------------
 5 files changed, 428 deletions(-)