[tor-commits] [spec/master] Merge pull request #44 from juga0/feature/psiphon-dev

[art at torproject.org]

commit c9be501c39e65bb98a3640be6c7a67ed9ec911a8
Merge: 93fbc7b 7e00a17
Author: Arturo Filastò <arturo at filasto.net>
Date:   Fri Nov 13 10:51:44 2015 +0100

    Merge pull request #44 from juga0/feature/psiphon-dev
    
    add psiphon test specification

 data-formats/df-000-base.md  |   2 +
 test-specs/ts-014-psiphon.md | 146 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)