Commit dc014c97 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.3'

parents a2f57b97 c88a4c51

changes/ticket5749

0 → 100644
+3 −0
Changes for changes/ticket5749: 3 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line 
  o New directory authorities:

    - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory

      authority. Closes ticket 5749.

src/or/config.c

+3 −0
Changes for src/or/config.c: 3 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -760,6 +760,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) 
    "maatuska orport=80 no-v2 "

    "maatuska orport=80 no-v2 "

      "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "

      "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "

      "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",

      "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

    NULL

  };

  };

  for (i=0; dirservers[i]; i++) {

  for (i=0; dirservers[i]; i++) {