commit 519426c5c545fe96577b38fa6fba29f98286b7cb Author: Isis Lovecruft isis@torproject.org Date: Sat Sep 6 03:07:34 2014 +0000

Disable obfs4 distribution (for now).

Until we have enough bridges supporting obfs4 to actually distribute them, and Tor Browser has obfs4 built in, I'm leaving the HTTPS dropdown item present but disabled, and nothing will be mentioned in emails sent by the Email Distributor until the `"obfs4"` line in `bridgedb.strings.CURRENT_TRANSPORTS is uncommented. --- lib/bridgedb/strings.py | 1 + lib/bridgedb/templates/options.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index bea2f5d..929c610 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -166,6 +166,7 @@ EMAIL_COMMANDS = { CURRENT_TRANSPORTS = [ "obfs2", "obfs3", + #"obfs4", "scramblesuit", "fte", ] diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html index e765ce7..79ac1df 100644 --- a/lib/bridgedb/templates/options.html +++ b/lib/bridgedb/templates/options.html @@ -89,7 +89,7 @@ <option label="none" value="0" >${_("none")}</option> <option label="obfs2" value="obfs2" >obfs2</option> <option label="obfs3" value="obfs3" selected >obfs3</option> -<option label="obfs4" value="obfs4" >obfs4</option> +<option label="obfs4" value="obfs4" disabled >obfs4</option> <option label="scramblesuit" value="scramblesuit">scramblesuit</option> <option label="fte" value="fte" >fteproxy</option> </select>