[tor-commits] [ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
art at torproject.org
art at torproject.org
Fri Dec 7 09:34:24 UTC 2012
commit eb9e61452b2dd45bc3bdc312f2177ccc90d40b59
Merge: 269f929 47c345d
Author: Arturo Filastò <art at fuffa.org>
Date: Fri Dec 7 10:34:12 2012 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
* 'master' of ssh://git-rw.torproject.org/ooni-probe:
This fixes a broken commit and fixes scripts/before_i_commit.sh
ooni/utils/txscapy.py | 2 +-
scripts/before_i_commit.sh | 21 +++++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
More information about the tor-commits
mailing list