diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-20 01:04:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-20 01:04:49 -0500 |
| commit | 1525eeeb49a4666069371a8300d6fa1c22c04de3 (patch) | |
| tree | c65dde93e20ee862c24ecde4242db16e27d6ac84 /src/or | |
| parent | 7cbdec578b291da11dcd419988ee985b7589ec48 (diff) | |
| parent | 8e61d38cf107560a55ebdb8397230f3d88548745 (diff) | |
| download | tor-1525eeeb49a4666069371a8300d6fa1c22c04de3.tar.gz tor-1525eeeb49a4666069371a8300d6fa1c22c04de3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or')
| -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 892108278e..2a7237d595 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -871,7 +871,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", |