[tor-commits] [bridgedb/develop] Add example extrainfo `transport` line for scramblesuit.

[isis at torproject.org]

commit 58884217ad83a4c5711e6e2c54aaa846af890e4e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jan 14 20:13:56 2014 +0000

    Add example extrainfo `transport` line for scramblesuit.
    
    Philipp Winter's scramblesuit paper has a section on creating easily
    handwritable shared secrets. [0]
    
    To my memory, this excludes using the character `O` (capital o) and the
    integer `1`, because they are easily confused for the integer '0' and
    the character 'l', respectively. However, Philipp mentioned on IRC that
    scramblesuit `password=` fields in the `transport` line are actually
    just the set of base32 characters. [1]
    
     * ADD a line to doc/DESCRIPTORS.md which shows an example
       scramblesuit-enabled bridge which uses a shared secret passed through
       BridgeDB. See #9013.
    
    [0]: http://arxiv.org/abs/1305.3199
    [1]: https://tools.ietf.org/html/rfc4648
---
 doc/DESCRIPTORS.md |    1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md
index 8a456b7..226f368 100644
--- a/doc/DESCRIPTORS.md
+++ b/doc/DESCRIPTORS.md
@@ -170,6 +170,7 @@ obproxy pluggable transport types:
     dirreq-v3-tunneled-dl complete=12,timeout=0,running=0
     transport obfs3 10.0.1.111:3333
     transport obfs2 10.0.1.111:2222
+    transport scramblesuit 10.0.1.111:4444 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567
     bridge-stats-end 2013-10-21 13:04:24 (86400 s)
     bridge-ips ca=8
     bridge-ip-versions v4=8,v6=0