|
@@ -841,30 +841,30 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
|
|
|
{
|
|
|
int i;
|
|
|
const char *authorities[] = {
|
|
|
- "moria1 orport=9101 no-v2 "
|
|
|
+ "moria1 orport=9101 "
|
|
|
"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
|
|
|
"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
|
|
|
"tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
|
|
|
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
|
|
|
"dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
|
|
|
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
|
|
|
- "Tonga orport=443 bridge no-v2 82.94.251.203:80 "
|
|
|
+ "Tonga orport=443 bridge 82.94.251.203:80 "
|
|
|
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
|
|
|
- "turtles orport=9090 no-v2 "
|
|
|
+ "turtles orport=9090 "
|
|
|
"v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
|
|
|
"76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
|
|
|
- "gabelmoo orport=443 no-v2 "
|
|
|
+ "gabelmoo orport=443 "
|
|
|
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
|
|
|
"212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
|
|
|
- "dannenberg orport=443 no-v2 "
|
|
|
+ "dannenberg orport=443 "
|
|
|
"v3ident=585769C78764D58426B8B52B6651A5A71137189A "
|
|
|
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
|
|
|
- "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
|
|
|
+ "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
|
|
|
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
|
|
|
- "maatuska orport=80 no-v2 "
|
|
|
+ "maatuska orport=80 "
|
|
|
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
|
|
|
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
|
|
|
- "Faravahar orport=443 no-v2 "
|
|
|
+ "Faravahar orport=443 "
|
|
|
"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
|
|
|
"154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
|
|
|
NULL
|
|
@@ -2345,7 +2345,7 @@ ensure_bandwidth_cap(uint64_t *value, const char *desc, char **msg)
|
|
|
|
|
|
/** Parse an authority type from <b>options</b>-\>PublishServerDescriptor
|
|
|
* and write it to <b>options</b>-\>PublishServerDescriptor_. Treat "1"
|
|
|
- * as "v2,v3" unless BridgeRelay is 1, in which case treat it as "bridge".
|
|
|
+ * as "v3" unless BridgeRelay is 1, in which case treat it as "bridge".
|
|
|
* Treat "0" as "".
|
|
|
* Return 0 on success or -1 if not a recognized authority type (in which
|
|
|
* case the value of PublishServerDescriptor_ is undefined). */
|
|
@@ -2598,7 +2598,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
|
|
|
options->V1AuthoritativeDir ||
|
|
|
options->V3AuthoritativeDir))
|
|
|
REJECT("AuthoritativeDir is set, but none of "
|
|
|
- "(Bridge/HS/V1/V2/V3)AuthoritativeDir is set.");
|
|
|
+ "(Bridge/HS/V1/V3)AuthoritativeDir is set.");
|
|
|
/* If we have a v3bandwidthsfile and it's broken, complain on startup */
|
|
|
if (options->V3BandwidthsFile && !old_options) {
|
|
|
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL);
|
|
@@ -5048,6 +5048,9 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type,
|
|
|
is_not_hidserv_authority = 1;
|
|
|
} else if (!strcasecmp(flag, "bridge")) {
|
|
|
type |= BRIDGE_DIRINFO;
|
|
|
+ } else if (!strcasecmp(flag, "no-v2")) {
|
|
|
+ /* obsolete, but may still be contained in DirAuthority lines generated
|
|
|
+ by various tools */;
|
|
|
} else if (!strcasecmpstart(flag, "orport=")) {
|
|
|
int ok;
|
|
|
char *portstring = flag + strlen("orport=");
|