Unverified Commit 9955bd55 authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'fix/12130-obfs4' into develop

parents 0ade64bf 28489ab2
...@@ -162,11 +162,13 @@ EMAIL_COMMANDS = { ...@@ -162,11 +162,13 @@ EMAIL_COMMANDS = {
#: #:
#: 1. The PT is in a widely accepted, usable state for most Tor users. #: 1. The PT is in a widely accepted, usable state for most Tor users.
#: 2. The PT is currently publicly deployed *en masse*". #: 2. The PT is currently publicly deployed *en masse*".
#: 3. The PT is included within the transports which Tor Browser offers in
#: the stable releases.
#: #:
CURRENT_TRANSPORTS = [ CURRENT_TRANSPORTS = [
"obfs2", "obfs2",
"obfs3", "obfs3",
#"obfs4", "obfs4",
"scramblesuit", "scramblesuit",
"fte", "fte",
] ]
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<option label="none" value="0" >${_("none")}</option> <option label="none" value="0" >${_("none")}</option>
<option label="obfs2" value="obfs2" >obfs2</option> <option label="obfs2" value="obfs2" >obfs2</option>
<option label="obfs3" value="obfs3" selected >obfs3</option> <option label="obfs3" value="obfs3" selected >obfs3</option>
<option label="obfs4" value="obfs4" disabled >obfs4</option> <option label="obfs4" value="obfs4" >obfs4</option>
<option label="scramblesuit" value="scramblesuit">scramblesuit</option> <option label="scramblesuit" value="scramblesuit">scramblesuit</option>
<option label="fte" value="fte" >fteproxy</option> <option label="fte" value="fte" >fteproxy</option>
</select> </select>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment