]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Remove "hyphae" as a known value for BridgeDistribution.
authorAlexander Færøy <ahf@torproject.org>
Wed, 15 Jan 2020 23:20:27 +0000 (23:20 +0000)
committerAlexander Færøy <ahf@torproject.org>
Wed, 15 Jan 2020 23:20:27 +0000 (23:20 +0000)
This patch removes hyphae as a known value for the BridgeDistribution
option in torrc.

src/feature/relay/relay_config.c

index b919e5600b0650fdca69bd632921e521a0f23ce5..8d20e97eb6f68cbd227004308633332371a2e565 100644 (file)
@@ -468,7 +468,6 @@ compute_publishserverdescriptor(or_options_t *options)
  * - "https"
  * - "email"
  * - "moat"
- * - "hyphae"
  *
  * If the option string is unrecognised, a warning will be logged and 0 is
  * returned.  If the option string contains an invalid character, -1 is
@@ -481,7 +480,7 @@ check_bridge_distribution_setting(const char *bd)
     return 0;
 
   const char *RECOGNIZED[] = {
-    "none", "any", "https", "email", "moat", "hyphae"
+    "none", "any", "https", "email", "moat"
   };
   unsigned i;
   for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {