diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-19 17:27:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-19 17:27:37 -0500 |
| commit | 126f220071b2313147240b585df6893d21943021 (patch) | |
| tree | a4329ea61801cedd7d51e1ba93f63cc79985bc70 | |
| parent | fb3000e10c34bd72d1ed88f32f525c161768e400 (diff) | |
| parent | 0872d8e3cf3281fc5831375252db9e39de12e927 (diff) | |
| download | tor-126f220071b2313147240b585df6893d21943021.tar.gz tor-126f220071b2313147240b585df6893d21943021.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -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 a0351d5f8d..dc2fc13b9a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -846,7 +846,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) { |