commit 963cad2a4610be403a2592f5d2fa7b4aca05062b Merge: cf5e13c 3d87617 Author: Isis Lovecruft isis@torproject.org Date: Sat Sep 15 01:12:13 2012 +0000

Merge branch 'bridget-twisted'

ooni/plugins/bridget.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)