[tor-commits] [ooni-probe/master] Merge pull request #310 from anadahz/trac_7761

[art at torproject.org]

commit 1ecf348b4a552a5ac7ec115b389d738983456c80
Merge: ecba7cd 10ca73f
Author: Arturo Filastò <hellais at users.noreply.github.com>
Date:   Mon Apr 28 16:59:05 2014 +0200

    Merge pull request #310 from anadahz/trac_7761
    
    Add ThreatModel page to ooni documentation (#7761)

 docs/source/index.rst |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)