diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-22 09:31:09 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-22 09:31:09 -0400 |
| commit | dc014c97472e3adf2306938841c13de0040a2ff0 (patch) | |
| tree | a76749a07f135cbb845277c817106c0a3b373029 /src/or | |
| parent | a2f57b97998b325c059d2fac06ca37d4b4dc52a3 (diff) | |
| parent | c88a4c51b4cd2d6d584231a44a6e4ea4ac7396a0 (diff) | |
| download | tor-dc014c97472e3adf2306938841c13de0040a2ff0.tar tor-dc014c97472e3adf2306938841c13de0040a2ff0.tar.gz | |
Merge branch 'maint-0.2.3'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6f946ce98..462fc73c0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -760,6 +760,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 no-v2 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL }; for (i=0; dirservers[i]; i++) { |