sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.5' into release-0.2.5

This commit is contained in:
Nick Mathewson 2017-10-23 08:57:22 -04:00
parent 558eafe56e 5d219ecf98
commit 533ae56fcf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/longclaw_23592 Normal file
View File

@ -0,0 +1,3 @@
o Directory authority changes:
- The directory authority "Longclaw" has changed its IP address.
Closes ticket 23592.

2
src/or/config.c
View File

@ -872,7 +872,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
NULL
};
for (i=0; authorities[i]; i++) {