[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

[arma at torproject.org]

commit 87576e826f5f60d13478bb9de642be0e6f5533a1
Merge: be0e262 288b3ec
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 20 16:50:32 2014 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    Conflicts:
    	src/or/config.c

 changes/bug13100 |    3 +++
 src/or/config.c  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 31a3586,919dd27..39b85aa
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
        "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
      "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
        "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 -    "Tonga orport=443 bridge no-v2 82.94.251.203:80 "
 +    "Tonga orport=443 bridge 82.94.251.203:80 "
        "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 -    "turtles orport=9090 no-v2 "
 +    "turtles orport=9090 "
        "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
        "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
 -    "gabelmoo orport=443 no-v2 "
 +    "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 no-v2 "
 +    "dannenberg orport=443 "
        "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
        "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -    "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
 +    "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
        "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 -    "maatuska orport=80 no-v2 "
 +    "maatuska orport=80 "
        "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
        "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 -    "Faravahar orport=443 no-v2 "
 +    "Faravahar orport=443 "
        "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
        "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
      NULL