diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-09-20 16:50:32 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-09-20 16:50:32 -0400 |
| commit | 87576e826f5f60d13478bb9de642be0e6f5533a1 (patch) | |
| tree | ba664d4e56ac77509b740e84ee0949be760d2dfb /src | |
| parent | be0e26272b3e795b902394acc9b66642fcdc1f21 (diff) | |
| parent | 288b3ec6035aad694942960f3b71693907f7e584 (diff) | |
| download | tor-87576e826f5f60d13478bb9de642be0e6f5533a1.tar.gz tor-87576e826f5f60d13478bb9de642be0e6f5533a1.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 31a3586256..39b85aa1ab 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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", |