[tor-commits] [torspec/master] Merge branch 'prop188-self-testing'

[isis at torproject.org]

commit 9f376da882dfcd09f8d20bdb8343e2eb660e4c55
Merge: 20f523f eb9ac3b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Oct 30 14:39:43 2015 +0000

    Merge branch 'prop188-self-testing'

 proposals/188-bridge-guards.txt |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)