diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-06-11 13:20:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-06-11 13:20:20 -0400 |
| commit | be1c4672c4ea0dc55cc062a72741c7498138d8af (patch) | |
| tree | 0a10c259ff78c35c1d5c8dc2a16906af2818a6a1 | |
| parent | f9a4b3e45b75301544887f65092ceafde6a1103d (diff) | |
| parent | 6c49b6bb7735335230ade722d1eccdadd652e938 (diff) | |
| download | tor-be1c4672c4ea0dc55cc062a72741c7498138d8af.tar.gz tor-be1c4672c4ea0dc55cc062a72741c7498138d8af.zip | |
Merge commit 'origin/maint-0.2.1'
| -rw-r--r-- | changes/maatuska-new-v3auth | 3 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/maatuska-new-v3auth b/changes/maatuska-new-v3auth new file mode 100644 index 0000000000..9508b30a24 --- /dev/null +++ b/changes/maatuska-new-v3auth @@ -0,0 +1,3 @@ + o New directory authorities: + - Set up maatuska (run by Linus Nordberg) as the eighth v3 directory + authority. diff --git a/src/or/config.c b/src/or/config.c index 82184c77d6..efd8a27b3f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -759,6 +759,9 @@ add_default_trusted_dir_authorities(authority_type_t type) "193.23.244.244: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", + "maatuska orport=80 no-v2 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", NULL }; for (i=0; dirservers[i]; i++) { |