[tor-commits] [bridgedb/develop] Enable obfs4 distribution for both email and https.

[isis at torproject.org]

commit 28489ab24ccfb0c68dcc42d4d4531334478072b1
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Feb 2 21:46:20 2015 +0000

    Enable obfs4 distribution for both email and https.
---
 lib/bridgedb/strings.py             |    4 +++-
 lib/bridgedb/templates/options.html |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py
index 929c610..1991b5f 100644
--- a/lib/bridgedb/strings.py
+++ b/lib/bridgedb/strings.py
@@ -162,11 +162,13 @@ EMAIL_COMMANDS = {
 #:
 #:   1. The PT is in a widely accepted, usable state for most Tor users.
 #:   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 = [
     "obfs2",
     "obfs3",
-    #"obfs4",
+    "obfs4",
     "scramblesuit",
     "fte",
 ]
diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html
index 79ac1df..e765ce7 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"   disabled   >obfs4</option>
+<option label="obfs4" value="obfs4"              >obfs4</option>
 <option label="scramblesuit" value="scramblesuit">scramblesuit</option>
 <option label="fte"   value="fte"                >fteproxy</option>
                       </select>