diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:40:23 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:40:23 -0800 |
| commit | 9ca329581af71c9aa6890b63c29c6a51ac37e408 (patch) | |
| tree | b9816e646c80b56684cdc51770db6ac438cc263c /src/or | |
| parent | ae223138fbdd28ef452191c3a489e25e9a9b22c7 (diff) | |
| parent | 11f63d26acb8ca872d894fb1423b380dc1f8dc2e (diff) | |
| download | tor-9ca329581af71c9aa6890b63c29c6a51ac37e408.tar.gz tor-9ca329581af71c9aa6890b63c29c6a51ac37e408.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
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 2a7237d595..60d3d7feb5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -862,7 +862,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 " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", |