commit 399ec3130be818825e01b5ab0c8a8aac1845b29c Author: Alexander Færøy ahf@torproject.org Date: Wed Jan 15 23:20:27 2020 +0000

Remove "hyphae" as a known value for BridgeDistribution.

This patch removes hyphae as a known value for the BridgeDistribution option in torrc. --- src/feature/relay/relay_config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index b919e5600..8d20e97eb 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) {