Merge remote-tracking branch 'origin/maint-0.2.5'

changes/ticket14487

@@ -0,0 +1,3 @@
+  o Directory authority IP change:
+    - The directory authority Faravahar has a new IP address. Closes
+      ticket 14487.

src/or/config.c

@@ -875,7 +875,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
       "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
     "Faravahar orport=443 "
       "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-      "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+      "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
     "longclaw orport=443 "
       "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
       "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",