summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-01-15 23:20:27 +0000
committerAlexander Færøy <ahf@torproject.org>2020-01-15 23:20:27 +0000
commit399ec3130be818825e01b5ab0c8a8aac1845b29c (patch)
treeaaf21b48d978d85a5ece495713406fd84dd52817 /src
parent1c8bafcdf9285e93bc2f41b85556b00183f2408a (diff)
downloadtor-399ec3130be818825e01b5ab0c8a8aac1845b29c.tar.gz
tor-399ec3130be818825e01b5ab0c8a8aac1845b29c.zip
Remove "hyphae" as a known value for BridgeDistribution.
This patch removes hyphae as a known value for the BridgeDistribution option in torrc.
Diffstat (limited to 'src')
-rw-r--r--src/feature/relay/relay_config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
index b919e5600b..8d20e97eb6 100644
--- a/src/feature/relay/relay_config.c
+++ b/src/feature/relay/relay_config.c
@@ -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) {