diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-20 01:05:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-20 01:05:21 -0500 |
| commit | 03a4e97c76b2021ec7246da03fb31d337fb50f9b (patch) | |
| tree | 92b95570468ce4b129da2bc6e71dbac476841e14 /src | |
| parent | 5334bcd7e30d6247522f2d1154f0ceacc46fdc80 (diff) | |
| parent | 1525eeeb49a4666069371a8300d6fa1c22c04de3 (diff) | |
| download | tor-03a4e97c76b2021ec7246da03fb31d337fb50f9b.tar.gz tor-03a4e97c76b2021ec7246da03fb31d337fb50f9b.zip | |
Merge remote-tracking branch 'origin/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 fa0e753d86..5ba8c997fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -875,7 +875,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", |