Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2012-02-29 13:23:23 -05:00
commit 406bc95271
2 changed files with 4 additions and 1 deletions

3
changes/maatuska-ip Normal file
View File

@ -0,0 +1,3 @@
o Directory authority changes:
- Change IP address for maatuska (v3 directory authority).

View File

@ -928,7 +928,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
"maatuska orport=80 no-v2 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
NULL
};
for (i=0; dirservers[i]; i++) {