diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-19 17:26:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-19 17:26:42 -0500 |
| commit | 0872d8e3cf3281fc5831375252db9e39de12e927 (patch) | |
| tree | e5375ae2b2bea3ef0ac9be40f39b97881e0c228d /src | |
| parent | 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b (diff) | |
| parent | dca902ceba4d2440520d357ccc2e00b8aa59eb8b (diff) | |
| download | tor-0872d8e3cf3281fc5831375252db9e39de12e927.tar.gz tor-0872d8e3cf3281fc5831375252db9e39de12e927.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
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 89ea58677a..892108278e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -874,7 +874,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++) { |