|
@@ -208,7 +208,7 @@ static config_var_t option_vars_[] = {
|
|
OBSOLETE("AllowInvalidNodes"),
|
|
OBSOLETE("AllowInvalidNodes"),
|
|
V(AllowNonRFC953Hostnames, BOOL, "0"),
|
|
V(AllowNonRFC953Hostnames, BOOL, "0"),
|
|
OBSOLETE("AllowSingleHopCircuits"),
|
|
OBSOLETE("AllowSingleHopCircuits"),
|
|
- V(AllowSingleHopExits, BOOL, "0"),
|
|
|
|
|
|
+ OBSOLETE("AllowSingleHopExits"),
|
|
V(AlternateBridgeAuthority, LINELIST, NULL),
|
|
V(AlternateBridgeAuthority, LINELIST, NULL),
|
|
V(AlternateDirAuthority, LINELIST, NULL),
|
|
V(AlternateDirAuthority, LINELIST, NULL),
|
|
OBSOLETE("AlternateHSAuthority"),
|
|
OBSOLETE("AlternateHSAuthority"),
|
|
@@ -662,8 +662,6 @@ static const config_deprecation_t option_deprecation_notes_[] = {
|
|
/* Deprecated since 0.2.9.2-alpha... */
|
|
/* Deprecated since 0.2.9.2-alpha... */
|
|
{ "AllowDotExit", "Unrestricted use of the .exit notation can be used for "
|
|
{ "AllowDotExit", "Unrestricted use of the .exit notation can be used for "
|
|
"a wide variety of application-level attacks." },
|
|
"a wide variety of application-level attacks." },
|
|
- { "AllowSingleHopExits", "Turning this on will make your relay easier "
|
|
|
|
- "to abuse." },
|
|
|
|
{ "ClientDNSRejectInternalAddresses", "Turning this on makes your client "
|
|
{ "ClientDNSRejectInternalAddresses", "Turning this on makes your client "
|
|
"easier to fingerprint, and may open you to esoteric attacks." },
|
|
"easier to fingerprint, and may open you to esoteric attacks." },
|
|
{ "ExcludeSingleHopRelays", "Turning it on makes your client easier to "
|
|
{ "ExcludeSingleHopRelays", "Turning it on makes your client easier to "
|
|
@@ -4056,13 +4054,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
|
|
"AlternateDirAuthority and AlternateBridgeAuthority configured.");
|
|
"AlternateDirAuthority and AlternateBridgeAuthority configured.");
|
|
}
|
|
}
|
|
|
|
|
|
- if (options->AllowSingleHopExits && !options->DirAuthorities) {
|
|
|
|
- COMPLAIN("You have set AllowSingleHopExits; now your relay will allow "
|
|
|
|
- "others to make one-hop exits. However, since by default most "
|
|
|
|
- "clients avoid relays that set this option, most clients will "
|
|
|
|
- "ignore you.");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
#define CHECK_DEFAULT(arg) \
|
|
#define CHECK_DEFAULT(arg) \
|
|
STMT_BEGIN \
|
|
STMT_BEGIN \
|
|
if (!options->TestingTorNetwork && \
|
|
if (!options->TestingTorNetwork && \
|