Commit 9ca32958 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.4' into maint-0.2.5 

Conflicts:
	src/or/config.c
parents ae223138 11f63d26

changes/bug17906

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features (authorities):

    - Update the V3 identity key for dannenberg, it was changed on

      18 November 2015.

      Closes task #17906. Patch by "teor".

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) 
      "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "

      "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

    "dannenberg orport=443 "

      "v3ident=585769C78764D58426B8B52B6651A5A71137189A "

      "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",