commit f7d1077e9be04ca66ced8f209d6a258d2c4a6d5e Merge: 117ee8e 67af973 Author: Arturo Filastò hellais@gmail.com Date: Thu Jul 4 06:08:33 2013 -0700

Merge pull request #127 from aagbsn/feature/document_how_ooni_uses_bridges

Feature/document how ooni uses bridges

README.md | 22 ++++++++++++++++++++-- ooni/director.py | 23 +++++++++++------------ ooni/settings.py | 16 ++++------------ 3 files changed, 35 insertions(+), 26 deletions(-)