diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:21:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:21:25 -0400 |
| commit | c28ba994ec95f4f669ad5131f36b0f9f1cc53782 (patch) | |
| tree | 06a733c9a34a054e17c5a6ee91e4ea01ab73aaf7 /src/or/config.c | |
| parent | b4bb88606e52c21c3b831a957516057004152bf4 (diff) | |
| parent | 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 (diff) | |
| download | tor-c28ba994ec95f4f669ad5131f36b0f9f1cc53782.tar.gz tor-c28ba994ec95f4f669ad5131f36b0f9f1cc53782.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 7444af6fd0..89b6087814 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -867,9 +867,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", |