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

[nickm@xxxxxxxxxxxxxx]

commit c7b0cd9c2f52ca289515833060ac0b8461da2225
Merge: 400df18 9ca3295
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jan 7 09:41:36 2016 -0800

    Merge branch 'maint-0.2.5' into maint-0.2.6

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

diff --cc src/or/config.c
index fca350c,60d3d7f..7444af6
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir
        "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 "
 +    "urras orport=80 "
 +      "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
        "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
      "maatuska orport=80 "
        "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits