Commit 87576e82 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.4' into maint-0.2.5 

Conflicts:
	src/or/config.c
parents be0e2627 288b3ec6

changes/bug13100

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Directory authority changes:

    - Change IP address for gabelmoo (v3 directory authority).

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) 
      "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",

    "gabelmoo orport=443 "

      "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "

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

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

    "dannenberg orport=443 "

      "v3ident=585769C78764D58426B8B52B6651A5A71137189A "

      "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",