[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

commit eb9e61452b2dd45bc3bdc312f2177ccc90d40b59
Merge: 269f929 47c345d
Author: Arturo Filastò <art@xxxxxxxxx>
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(-)


_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits