Commit c28ba994 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.6

parents b4bb8860 9d3de77d

src/or/config.c

+0 −3
Original line number Diff line number Diff line
@@ -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",