[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'gh-common/master'

[isis at torproject.org]

commit 946a321a0a120697ca5fb42f4c6972361fa2afaa
Merge: 4bd8e05 5ca95ac
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Mar 11 19:04:56 2013 +0000

    Merge remote-tracking branch 'gh-common/master'

 requirements.txt |    5 +---
 setup.py         |   55 ++++++++++++++++++++++++++---------------------------
 2 files changed, 28 insertions(+), 32 deletions(-)