[tor-commits] [torspec/master] dir-spec: Revise specification for "bridge-distribution-request" lines.

[nickm at torproject.org]

commit 4f6ab8d506b0a2716aa8269aaa89652e251d27ad
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon May 15 22:36:35 2017 +0000

    dir-spec: Revise specification for "bridge-distribution-request" lines.
    
     * FIXES part of #18329
---
 dir-spec.txt | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index dac94dc..2b61a4a 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -608,13 +608,30 @@
        Describes a way to contact the relay's administrator, preferably
        including an email address and a PGP key fingerprint.
 
-    "bridge-distribution-request" SP info NL
+    "bridge-distribution-request" SP Method NL
 
-       [At most once]
+        [At most once]
 
-       "info" describes how a Bridge address is distributed by BridgeDB. If
-       set to "none", BridgeDB will avoid distributing your bridge address.
-       The other possible options are specified in the BridgeDB documentation.
+        The "Method" describes how a Bridge address is distributed by
+        BridgeDB. Recognized methods are: "none", "any", "https", "email",
+        "moat", "hyphae". If set to "none", BridgeDB will avoid distributing
+        your bridge address. If set to "any", BridgeDB will choose how to
+        distribute your bridge address. Choosing any of the other methods will
+        tell BridgeDB to distribute your bridge via a specific method:
+
+          - "https" specifies distribution via the web interface at
+             https://bridges.torproject.org;
+          - "email" specifies distribution via the email autoresponder at
+            bridges at torproject.org;
+          - "moat" specifies distribution via an interactive menu inside Tor
+            Browser; and
+          - "hyphae" specifies distribution via a cryptographically-secure,
+            invitation-based system.
+
+        Potential future "Method" specifiers must be as follows:
+            Method = (KeywordChar | "_") +
+
+        (Default: "any")
 
     "family" names NL