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

[isis at torproject.org]

commit 97baa25573ff7868d240e789d06f940d74c849f3
Merge: 9c44988 310780e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Sep 10 06:34:09 2015 +0000

    Merge branch 'prop188'

 proposals/188-bridge-guards.txt |  458 +++++++++++++++++++++++++++++++--------
 1 file changed, 369 insertions(+), 89 deletions(-)