diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:41:36 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:41:36 -0800 |
| commit | c7b0cd9c2f52ca289515833060ac0b8461da2225 (patch) | |
| tree | cb141ee9853f9f28863a21d72e287fe6c35009ba /src | |
| parent | 400df18688e3b657852a9007151aaf26febe29a6 (diff) | |
| parent | 9ca329581af71c9aa6890b63c29c6a51ac37e408 (diff) | |
| download | tor-c7b0cd9c2f52ca289515833060ac0b8461da2225.tar.gz tor-c7b0cd9c2f52ca289515833060ac0b8461da2225.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.6
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 fca350c203..7444af6fd0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -865,7 +865,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 " "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " |