diff options
author | Roger Dingledine <arma@torproject.org> | 2009-08-10 01:37:29 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2009-08-10 01:37:29 -0400 |
commit | 5f0fb9a10928c8b459e1bac79fa780fe83f76adf (patch) | |
tree | 340cb9a6b28d24ea34d74c292a62ea77c4e1675f /src/or/config.c | |
parent | 492416be0c9e4a510dc130301e0029d747b5756d (diff) | |
parent | 8abe3bac7e66a5ef3f0d3275159e0012ccd7212f (diff) | |
download | tor-5f0fb9a10928c8b459e1bac79fa780fe83f76adf.tar tor-5f0fb9a10928c8b459e1bac79fa780fe83f76adf.tar.gz |
Merge branch 'maint-0.2.1' into tmp_merge
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 951f6fab5..0b580876f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -919,6 +919,8 @@ add_default_trusted_dir_authorities(authority_type_t type) "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "213.73.91.31:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", + "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", NULL }; for (i=0; dirservers[i]; i++) { |